Merge branch 'main' into testing-shit

you can now utilize all of ps-ui, bl_ui, and glow_minigames

client/animationsandfunctions.lua

@@ -1,8 +1,7 @@
 
 local QBCore = exports['qb-core']:GetCoreObject()
 local started = nil
-
-local function loadParticle(dict)
+ function loadParticle(dict)
     if not HasNamedPtfxAssetLoaded(dict) then
         RequestNamedPtfxAsset(dict)
     end
@@ -15,93 +14,73 @@ end
 
 
 function MethCooking()
-local animDict, animName = "anim@amb@business@meth@meth_monitoring_cooking@cooking@", "chemical_pour_short_cooker"
-lib.requestAnimDict(animDict, 500)
-dict = "scr_ornate_heist"
-local ped = PlayerPedId()
-SetEntityCoords(ped, vector3(1005.773, -3200.402, -38.524))
-Wait(1)
-local targetPosition = GetEntityCoords(ped)
-local animDuration = GetAnimDuration(animDict, animName) * 800
-FreezeEntityPosition(ped, true)
-local scenePos, sceneRot = vector3(1010.656, -3198.445, -38.925), vector3(0.0, 0.0, 0.0)
-local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
-NetworkAddPedToSynchronisedScene(ped, netScene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
-local sacid = CreateObjectNoOffset(`bkr_prop_meth_sacid`, targetPosition, 1, 1, 0)
-NetworkAddEntityToSynchronisedScene(sacid, netScene, animDict, "chemical_pour_short_sacid", 4.0, -8.0, 1)
-local ammonia = CreateObjectNoOffset(`bkr_prop_meth_ammonia`, targetPosition, 1, 1, 0)
-NetworkAddEntityToSynchronisedScene(ammonia, netScene, animDict, "chemical_pour_short_ammonia", 4.0, -8.0, 1)
-NetworkStartSynchronisedScene(netScene)
-Wait(animDuration)
-NetworkStopSynchronisedScene(netScene)
-DeleteObject(sacid)
-DeleteObject(ammonia)
-FreezeEntityPosition(ped, false)
-lib.requestModel('hei_prop_heist_thermite', 2000)
-loadParticle('scr_ornate_heist')
-
-local thermite = CreateObject('hei_prop_heist_thermite', vector3(1005.76, -3201.3, -39.25), true, false, false)
-FreezeEntityPosition(thermite, true)
-SetEntityRotation(thermite, 190.0, 90.0, 140.0, 3, true )
-Wait(1000)
-local therm = StartParticleFxLoopedOnEntity('scr_heist_ornate_thermal_burn', thermite, 0.0, 1.4, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
-Wait(math.random(10000, 20000))
-StopParticleFxLooped(therm, true)
+	local animDict, animName = "anim@amb@business@meth@meth_monitoring_cooking@cooking@", "chemical_pour_short_cooker"
+	lib.requestAnimDict(animDict, 500)
+	SetEntityCoords(PlayerPedId(), vector3(1005.773, -3200.402, -38.524))
+	local targetPosition = GetEntityCoords(PlayerPedId())
+	local animDuration = GetAnimDuration(animDict, animName) * 800
+	FreezeEntityPosition(PlayerPedId(), true)
+	local scenePos, sceneRot = vector3(1010.656, -3198.445, -38.925), vector3(0.0, 0.0, 0.0)
+	local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
+	NetworkAddPedToSynchronisedScene(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)
+	lib.requestModel('hei_prop_heist_thermite', 2000)
+	loadParticle('scr_ornate_heist')
+	local thermite = CreateObject('hei_prop_heist_thermite', vector3(1005.76, -3201.3, -39.25), true, false, false)
+	FreezeEntityPosition(thermite, true)
+	SetEntityRotation(thermite, 190.0, 90.0, 140.0, 3, true )
+	Wait(1000)
+	local therm = StartParticleFxLoopedOnEntity('scr_heist_ornate_thermal_burn', thermite, 0.0, 1.4, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
+	Wait(math.random(10000, 20000))
+	StopParticleFxLooped(therm, true)
 end
 
 
 function SmashMeth()
-local ver = ""
-local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char02"
-lib.requestAnimDict(animDict, 500)
-local ped = PlayerPedId()
-local targetPosition = vector3(1012.628, -3194.619, -39.589)
-SetEntityCoords(ped, targetPosition)
-Wait(1)
-local animDuration = GetAnimDuration(animDict, animName) * 800
-FreezeEntityPosition(ped, true)
-local scenePos, sceneRot = vector3(1008.734, -3196.646, -39.99), vector3(0.0, 0.0, 1.08)
-local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
-NetworkAddPedToSynchronisedScene(ped, netScene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
-local objects, sceneObjects = {}, {
-	{
-		hash = `w_me_hammer`,
-		animName = "break_weigh_"..ver.."hammer"
-	},
-	{
-		hash = `bkr_Prop_Meth_SmashedTray_01_frag_`,
-		animName = "break_weigh_"..ver.."tray01"
-	},
-	{
-		hash = `bkr_Prop_Meth_Tray_02a`,
-		animName = "break_weigh_"..ver.."tray01^1"
-	},
-	{
-		hash = `bkr_Prop_Meth_Tray_02a`,
-		animName = "break_weigh_"..ver.."tray01^2"
-	},
-	{
-		hash = `bkr_Prop_Meth_SmashedTray_01_frag_`,
-		animName = "break_weigh_"..ver.."tray01^3"
-	},
-}
-for i=1, #sceneObjects, 1 do
-	local obj = CreateObjectNoOffset(sceneObjects[i].hash, targetPosition, true, true, true)
-	NetworkAddEntityToSynchronisedScene(obj, netScene, animDict, sceneObjects[i].animName, 4.0, -8.0, 1)
-	objects[#objects+1] = obj
-end
-NetworkStartSynchronisedScene(netScene)
-Wait(animDuration)
-NetworkStopSynchronisedScene(netScene)
-for i=1, #objects, 1 do
-	DeleteObject(objects[i])
-end
-RemoveAnimDict(animDict)
-FreezeEntityPosition(ped, false)
+	local ver = ""
+	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char02"
+	lib.requestAnimDict(animDict, 500)
+	local ped = PlayerPedId()
+	local targetPosition = vector3(1012.628, -3194.619, -39.589)
+	SetEntityCoords(ped, targetPosition)
+	Wait(1)
+	local animDuration = GetAnimDuration(animDict, animName) * 800
+	FreezeEntityPosition(ped, true)
+	local scenePos, sceneRot = vector3(1008.734, -3196.646, -39.99), vector3(0.0, 0.0, 1.08)
+	local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
+	NetworkAddPedToSynchronisedScene(ped, netScene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
+	local objects, sceneObjects = {}, {
+		{	hash = `w_me_hammer`,	animName = "break_weigh_" .. ver .. "hammer"},
+		{	hash = `bkr_Prop_Meth_SmashedTray_01_frag_`,	animName = "break_weigh_"..ver.."tray01"},
+		{	hash = `bkr_Prop_Meth_Tray_02a`,	animName = "break_weigh_"..ver.."tray01^1"},
+		{	hash = `bkr_Prop_Meth_Tray_02a`,	animName = "break_weigh_"..ver.."tray01^2"},
+		{	hash = `bkr_Prop_Meth_SmashedTray_01_frag_`,	animName = "break_weigh_"..ver.."tray01^3"},
+	}
+	for i=1, #sceneObjects, 1 do
+		local obj = CreateObjectNoOffset(sceneObjects[i].hash, targetPosition, true, true, true)
+		NetworkAddEntityToSynchronisedScene(obj, netScene, animDict, sceneObjects[i].animName, 4.0, -8.0, 1)
+		objects[#objects+1] = obj
+	end
+	NetworkStartSynchronisedScene(netScene)
+	Wait(animDuration)
+	NetworkStopSynchronisedScene(netScene)
+	for i=1, #objects, 1 do
+		DeleteObject(objects[i])
+	end
+	RemoveAnimDict(animDict)
+	FreezeEntityPosition(ped, false)
 end
 
 function BagMeth()
-local ver = ""
+	local ver = ""
 	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char01"
 	lib.requestAnimDict(animDict, 500)
 	local animDuration = GetAnimDuration(animDict, animName) * 1000
@@ -110,70 +89,28 @@ local ver = ""
 	local scenePos, sceneRot = vector3(1008.734, -3196.646, -39.99), vector3(0.0, 0.0, 1.08)
 	local scenes = {
 	{
-		{
-			hash = `bkr_prop_meth_bigbag_04a`,
-			animName = "break_weigh_"..ver.."box01"
-		},
-		{
-			hash = `bkr_prop_meth_bigbag_03a`,
-			animName = "break_weigh_"..ver.."box01^1"
-		},
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01"
-		}
+		{	hash = `bkr_prop_meth_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^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_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_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"
-		}
+		{	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 = {}, {}
@@ -200,7 +137,6 @@ for i=1, #scenesList, 1 do
 end
 
 Wait(animDuration-11000)
--- Citizen.Wait(45000)
 for i=1, #scenesList, 1 do
 	NetworkStopSynchronisedScene(scenesList[i])
 end
@@ -212,18 +148,18 @@ FreezeEntityPosition(ped, false)
 end
 
 function Tray()
-local pos = GetEntityCoords(PlayerPedId(), true)
-RequestAnimDict('anim@heists@box_carry@')
-while (not HasAnimDictLoaded('anim@heists@box_carry@')) do
-Wait(7)
-end
-TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
-RequestModel("bkr_prop_meth_tray_02a")
-while not HasModelLoaded("bkr_prop_meth_tray_02a") do
-Wait(0)
-end
-local trays = CreateObject("bkr_prop_meth_tray_02a", pos.x, pos.y, pos.z, true, true, true)
-AttachEntityToEntity(trays, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 28422), 0.01,-0.2, -0.2, 20.0, 0.0, 0.0, true, true, false, true, 1, true)
+	local pos = GetEntityCoords(PlayerPedId(), true)
+	RequestAnimDict('anim@heists@box_carry@')
+	while (not HasAnimDictLoaded('anim@heists@box_carry@')) do
+	Wait(7)
+	end
+	TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
+	RequestModel("bkr_prop_meth_tray_02a")
+	while not HasModelLoaded("bkr_prop_meth_tray_02a") do
+	Wait(0)
+	end
+	local trays = CreateObject("bkr_prop_meth_tray_02a", pos.x, pos.y, pos.z, true, true, true)
+	AttachEntityToEntity(trays, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 28422), 0.01,-0.2, -0.2, 20.0, 0.0, 0.0, true, true, false, true, 1, true)
 end
 
 
@@ -237,65 +173,53 @@ function CutCoke()
 	local scenePos, sceneRot = vector3(1090.37+.9, -3193.61-1.68, -39.60), vector3(0.0, 0.0, 0.00)
 	local scenes = {
 	{
-		{
-			hash = `bkr_prop_coke_bakingsoda_o`,
-			animName = "coke_cut_v5_bakingsoda"
-		},
-		{
-			hash = `prop_cs_credit_card`,
-			animName = "coke_cut_v5_creditcard"
-		},
-		{
-			hash = `prop_cs_credit_card`,
-			animName = "coke_cut_v5_creditcard^1"
-		}
+		{	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)
+	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
-		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)
+		scenesList[#scenesList+1] = scene
+	end
+	DisableCamCollisionForEntity(ped)
+	FreezeEntityPosition(ped, true)
+	for i=1, #scenesList, 1 do
+		NetworkStartSynchronisedScene(scenesList[i])
 	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)
+	Wait(animDuration-11000)
+	for i=1, #scenesList, 1 do
+		NetworkStopSynchronisedScene(scenesList[i])
+	end
+	for i=1, #entitiesList, 1 do
+		DeleteEntity(entitiesList[i])
+	end
+	RemoveAnimDict(animDict)
+	FreezeEntityPosition(ped, false)
 end
 
 CreateThread(function()
-
 	BikerCocaine = exports['bob74_ipl']:GetBikerCocaineObject()
     BikerCocaine.Style.Set(BikerCocaine.Style.upgrade)
     BikerCocaine.Security.Set(BikerCocaine.Security.upgrade)
     BikerCocaine.Details.Enable({BikerCocaine.Details.cokeBasic1, BikerCocaine.Details.cokeBasic2, BikerCocaine.Details.cokeBasic3}, true)
-
 end)
 
- function BagCoke()
+function BagCoke()
 local ver = ""
 	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char01"
 	lib.requestAnimDict(animDict, 500)
@@ -305,52 +229,22 @@ local ver = ""
 	local scenePos, sceneRot = vector3(1090.62+4.3, -3196.2+3, -38.99-1), vector3(360.0, 360.0, 180.08)
 	local scenes = {
 	{
-		{
-			hash = `bkr_prop_coke_cutblock_01`,
-			animName = "break_weigh_"..ver.."box01"
-		},
-		{
-			hash = `bkr_prop_coke_fullmetalbowl_02`,
-			animName = "break_weigh_"..ver.."box01^1"
-		},
-		{
-			hash = `bkr_prop_coke_cutblock_01`,
-			animName = "break_weigh_"..ver.."methbag01"
-		}
+		{	hash = `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 = `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_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"
-		},
+		{	hash = `bkr_prop_fakeid_clipboard_01a`,	animName = "break_weigh_"..ver.."clipboard"},
 		
 	}
 }
@@ -378,7 +272,6 @@ for i=1, #scenesList, 1 do
 end
 
 Wait(animDuration-11000)
--- Citizen.Wait(45000)
 for i=1, #scenesList, 1 do
 	NetworkStopSynchronisedScene(scenesList[i])
 end
@@ -477,19 +370,20 @@ function AlienEffect()
     StopScreenEffect("DrugsMichaelAliensFightOut")
 end
 
+local hit = 0
 function SpawnCarPedChase()
-local ped = GetEntityCoords(PlayerPedId())
-local stoploc = vector3(-1157.63, -3056.71, 13.94)
-local start = Config.StartLoc[math.random(1,#Config.StartLoc)]
-if started then  --  checks if active
-else
+	local stoploc = vector3(-1157.63, -3056.71, 13.94)
+	local start = Config.StartLoc[math.random(1,#Config.StartLoc)]
+	if started then
+		Notify(Lang.lean.act,'error')
+	else
     started = true
     lib.requestModel(`pounder`, Config.RequestModelTime)
     lib.requestModel("ig_priest", Config.RequestModelTime)
     lib.requestModel(`cargobob3`, Config.RequestModelTime)
-   local leancar = CreateVehicle(`pounder`, start.x+3, start.y-2, start.z-1, 52.0, true, true)
-   local driver = CreatePed(26, "ig_priest", start.x, start.y, start.z, 268.9422, true, false)
-   local pilot2 = CreatePed(26, "ig_priest", stoploc.x-3, stoploc.y-3, stoploc.z-1, 268.9422, true, false)
+    local leancar = CreateVehicle(`pounder`, start.x+3, start.y-2, start.z-1, 52.0, true, true)
+    local driver = CreatePed(26, "ig_priest", start.x, start.y, start.z, 268.9422, true, false)
+    local pilot2 = CreatePed(26, "ig_priest", stoploc.x-3, stoploc.y-3, stoploc.z-1, 268.9422, true, false)
 	FreezeEntityPosition(pilot2, true)
 	SetEntityInvincible(pilot2, true)
     SetEntityAsMissionEntity(leancar)
@@ -497,53 +391,27 @@ else
     SetPedIntoVehicle(driver, leancar, -1)
     SetPedFleeAttributes(driver,false)
     TaskVehicleDriveToCoordLongrange(driver, leancar, stoploc.x, stoploc.y, stoploc.z-1, 50.0, 524288, 25.0)
-    SetPedKeepTask(driver, true) -- everything above is ped/ veh spawn
-	repeat -- repeats Wait(1000) only until 
+    SetPedKeepTask(driver, true) 
+	repeat 
 		Wait(1000)
-	until #(GetEntityCoords(driver) - stoploc) < 20.0 or GetEntityHealth(driver) == 0 -- either the distance is within 20 OR the driver is dead
-	if GetEntityHealth(driver) == 0 then  -- once one of those thing ends, the loop breaks and carries on from here
-		if Config.oxtarget then 
-			local options = {
-				{
-					name = 'leancar',
-					icon = 'fa-solid fa-car',
-					label = 'Steal From Car',
-					onSelect = function()
-						 if not minigame(2,8) then return end
-						TriggerServerEvent('md-drugs:server:givelean')
-						started = nil
-						if math.random(1,100) <= 30 then
-							DeleteVehicle(leancar)
-							DeleteEntity(driver)
-							DeleteEntity(pilot2)
-						 end    
-					end,		
-				}
-			}                
-			exports.ox_target:addLocalEntity(leancar, options)
-		else	
-			exports['qb-target']:AddTargetEntity(leancar, {
-    		options = {
-    		       {
-    		           name = 'leancar',
-    		           icon = 'fa-solid fa-car',
-    		           label = 'Steal From Car',
-    		           action = function()
-							if not minigame(2,8) then return end
-    		               TriggerServerEvent('md-drugs:server:givelean')
-    		               started = nil
-    		               if math.random(1,100) <= 30 then
-    		                   DeleteVehicle(leancar)
-    		                   DeleteEntity(driver)
-    		                   DeleteEntity(pilot2)
-    		                end    
-    		           end,		
-    		       }
-    		   }                
-    		})
-		end
+	until #(GetEntityCoords(driver) - stoploc) < 20.0 or GetEntityHealth(driver) == 0 
+	RemoveBlip(leancar)
+	if GetEntityHealth(driver) == 0 then 
+		AddSingleModel(leancar, { name = 'leancar', icon = 'fa-solid fa-car', label = 'Steal From Car',
+			action = function()
+				hit = hit + 1
+				 if not minigame() then return end
+					TriggerServerEvent('md-drugs:server:givelean')
+					started = nil
+					if math.random(1,100) <= 30 or hit == 4 then
+					hit = 0
+					DeleteVehicle(leancar)
+					DeleteEntity(driver)
+					DeleteEntity(pilot2)
+				 end    
+			end}, nil)
 	else
-		repeat -- this second loop is to spawn the helicopter when the truck is in distance 
+		repeat  
 			Wait(1000)
 		until #(GetEntityCoords(driver) - GetEntityCoords(pilot2)) < 25.0
         Wait( 3 * 1000)
@@ -569,7 +437,8 @@ local stoploc = vector3(-1157.63, -3056.71, 13.94)
 local start = Config.StartLoc[math.random(1,#Config.StartLoc)]
 local startedmeth = false
 
-if startedmeth then 
+if startedmeth then
+	Notify(Lang.meth.act,'error')
 else
     startedmeth = true
     lib.requestModel(`journey`, Config.RequestModelTime)
@@ -590,46 +459,21 @@ else
 		Wait(1000)
 	until #(GetEntityCoords(methdriver) - stoploc) < 20.0 or GetEntityHealth(methdriver) == 0
 	if GetEntityHealth(methdriver) == 0 then 
-		if Config.oxtarget then 
-			local options = {
-				{
-					name = 'methcar',
-					icon = 'fa-solid fa-car',
-					label = 'Steal From Car',
-					onSelect = function()
-						 if not minigame(2,8) then return end
-						 TriggerServerEvent('md-drugs:server:givemethingridients')
-						 startedmeth = nil
-						if math.random(1,100) <= 30 then
-							DeleteVehicle(methcar)
-                            DeleteEntity(methdriver)
-                            DeleteEntity(methpilot)
-						 end    
-					end,		
-				}
-			}                
-			exports.ox_target:addLocalEntity(methcar, options)
-		else	
-			exports['qb-target']:AddTargetEntity(methcar, {
-    		options = {
-    		       {
-    		           name = 'methcar',
-    		           icon = 'fa-solid fa-car',
-    		           label = 'Steal From Car',
-    		           action = function()
-						if not minigame(2,8) then return end
-						TriggerServerEvent('md-drugs:server:givemethingridients')
-						startedmeth = nil
-					    if math.random(1,100) <= 30 then
-						   DeleteVehicle(methcar)
-						   DeleteEntity(methdriver)
-						   DeleteEntity(methpilot)
-						end    
-    		           end,		
-    		       }
-    		   }                
-    		})
-		end
+		AddSingleModel(methcar,{
+			name = 'methcar',
+			icon = 'fa-solid fa-car',
+			label = Lang.targets.meth.stealfromcar,
+			action = function()
+			 if not minigame() then return end
+			 TriggerServerEvent('md-drugs:server:givemethingridients')
+			 startedmeth = nil
+			 if math.random(1,100) <= 30 then
+				DeleteVehicle(methcar)
+				DeleteEntity(methdriver)
+				DeleteEntity(methpilot)
+			 end    
+			end,		
+		}, nil )
 	else
 		repeat
 			Wait(1000)
@@ -653,54 +497,39 @@ end
 end
 
 function SetUpPeds()
-local 	ped = GetEntityCoords(PlayerPedId())
-local	CokePed = CreatePed(0, "g_m_y_famdnf_01", ped.x+3, ped.y-5, ped.z-1, 90.0, true, true)
-local	CokePed2 = CreatePed(0,"g_m_y_famdnf_01", ped.x+6, ped.y-10, ped.z-1, 90.0, true, true)
-local	CokePed3 = CreatePed(0,"g_m_y_famdnf_01", ped.x+-2, ped.y+5, ped.z-1, 90.0, true, true)
-local	CokePed4 = CreatePed(0,"g_m_y_famdnf_01", ped.x+8, ped.y-12, ped.z-1, 90.0, true, true)
-local	CokePed5 = CreatePed(0,"g_m_y_famdnf_01", ped.x+5, ped.y-2, ped.z-1, 90.0, true, true)
-local	CokePed6 = CreatePed(0,"g_m_y_famdnf_01", ped.x+2, ped.y-20, ped.z-1, 90.0, true, true)
-local	CokePed7 = CreatePed(0,"g_m_y_famdnf_01", ped.x+1, ped.y-10, ped.z-1, 90.0, true, true)
-AddRelationshipGroup('setups')
-local peds = {CokePed, CokePed2,CokePed3, CokePed4, CokePed5,CokePed6, CokePed7}
-for k, v in pairs (ped) do 
-	SetPedRelationshipGroupDefaultHash(v, 'setups')
-end
-SetPedArmour(CokePed, 200)
-SetPedCanSwitchWeapon(CokePed, true)
-GiveWeaponToPed(CokePed, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed2, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed2, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed3, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed3, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed4, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed4, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed5, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed5, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed6, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed6, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed7, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed7, PlayerPedId(), 0, 16)
-SetPedCombatAttributes(CokePed, 46, true)
-SetPedCombatAttributes(CokePed2, 46, true)
-SetPedCombatAttributes(CokePed3, 46, true)
-SetPedCombatAttributes(CokePed4, 46, true)
-SetPedCombatAttributes(CokePed5, 46, true)
-SetPedCombatAttributes(CokePed6, 46, true)
-SetPedCombatAttributes(CokePed7, 46, true)
+	AddRelationshipGroup('setups')
+	local ped = GetEntityCoords(PlayerPedId())
+	local peds = {
+		{x = ped.x+3, y = ped.y-5,  z = ped.z-1, },
+		{x = ped.x+6, y = ped.y-10, z =  ped.z-1,},
+		{x = ped.x+-2,y =  ped.y+5, z =  ped.z-1,},
+		{x = ped.x+8, y = ped.y-12, z =  ped.z-1,},
+		{x = ped.x+5, y = ped.y-2,  z = ped.z-1, },
+		{x = ped.x+2, y = ped.y-20, z =  ped.z-1,},
+		{x = ped.x+1, y = ped.y-10, z =  ped.z-1,},
+	}
+	for i = 1, #peds do 
+		local k = peds[i] 
+		i = CreatePed(0, "g_m_y_famdnf_01", k.x, k.y, k.z, 90.0, true, true)
+		SetPedRelationshipGroupHash(i, 'setups')
+		GiveWeaponToPed(i, "weapon_pistol", 1, false, true)
+		TaskCombatPed(i, PlayerPedId(), 0, 16)
+		SetPedCombatAttributes(i, 46, true)
+	end
 end
 
 RegisterCommand('DrugRep', function()
 	if not Config.TierSystem then return end
+	local rep = lib.callback.await('md-drugs:server:GetRep', false)
 	lib.registerContext({
 		id = 'DrugRep',
 		title = 'Drug Reputation',
 		options = {
-		  {icon = "fa-solid fa-face-flushed", title = 'Cocaine: '..QBCore.Functions.GetPlayerData().metadata.coke},
-		  {icon = "fa-solid fa-syringe", title = 'Heroin: '..QBCore.Functions.GetPlayerData().metadata.heroin},
-		  {icon = "fa-solid fa-vial", title = 'LSD: '..QBCore.Functions.GetPlayerData().metadata.lsd},
-		  {icon = "fa-solid fa-plug", title = 'Dealer: '..QBCore.Functions.GetPlayerData().metadata.dealerrep},
+		  {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 }
 		}
 	  })
 	  lib.showContext('DrugRep')

client/cocaine.lua

@@ -4,9 +4,9 @@ local cuttingcoke = nil
 local baggingcoke = nil
 
 local function pick(loc)
-if not progressbar(Lang.Coke.picking, 4000, 'uncuff') then return end
-TriggerServerEvent("coke:pickupCane", loc)  
-return true 
+    if not progressbar(Lang.Coke.picking, 4000, 'uncuff') then return end
+        TriggerServerEvent("coke:pickupCane", loc)  
+    return true
 end
 
 RegisterNetEvent('coke:respawnCane', function(loc)
@@ -14,31 +14,8 @@ RegisterNetEvent('coke:respawnCane', function(loc)
     local hash = GetHashKey(v.model)
     if not CocaPlant[loc] then
         CocaPlant[loc] = CreateObject(hash, v.location, false, true, true)
-       Freeze(CocaPlant[loc], true, v.heading)
-        local options = { 
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    action = function()
-                        if not pick(loc) then return end
-                    end
-                }
-            }
-        local optionsox = {
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    distance = 2.5,
-                    onSelect = function()
-                        if not pick(loc) then return end
-                    end
-                }
-            }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(CocaPlant[loc], optionsox)
-        else
-            exports['qb-target']:AddTargetEntity(CocaPlant[loc], {options = options, distance = 2.5})
-        end
+        Freeze(CocaPlant[loc], true, v.heading)
+        AddSingleModel(CocaPlant[loc], {icon = "fa-solid fa-seedling", label = Lang.targets.coke.pick, action = function() if not pick(loc) then return end end}, loc)
     end
 end)
 
@@ -50,50 +27,15 @@ 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
+        LoadModel(hash) 
         if not v.taken then
             CocaPlant[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
             Freeze(CocaPlant[k], true, v.heading)
-            local options = { 
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    action = function()
-                        if not pick(k) then return end
-                    end
-                }
-            }
-        local optionsox = {
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    distance = 2.5,
-                    onSelect = function()
-                        if not pick(k) then return end
-                    end
-                }
-            }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(CocaPlant[k], optionsox)
-        else
-            exports['qb-target']:AddTargetEntity(CocaPlant[k], {options = options, distance = 2.5})
+            AddSingleModel(CocaPlant[k], {icon = "fa-solid fa-seedling", label = Lang.targets.coke.pick, action = function() if not pick(k) then return end end}, k)
         end
     end
-    end
 end)
 
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('prop_plant_01a')
-        TriggerEvent('coke:init')
-    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'))
@@ -130,57 +72,19 @@ RegisterNetEvent("md-drugs:client:bagcoke", function()
 	    BagCoke()
     else
         if not progressbar(Lang.Coke.bagging, 5000, 'uncuff') then baggingcoke = nil return end
-    end      
+    end
 	TriggerServerEvent("md-drugs:server:bagcoke")
 	baggingcoke = nil
-   
 end)
 
 CreateThread(function()
-	local options = {
-		{ type = "client", event = "md-drugs:client:cutcokeone", icon = "fas fa-sign-in-alt", label = "cut up", canInteract = function()
-				if cuttingcoke == nil and baggingcoke == nil then return true end
-			end			
-		},
-	}
-    local options2 = {
-		{ type = "client", event = "md-drugs:client:bagcoke", icon = "fas fa-sign-in-alt", label = "bagging", canInteract = function()
-				if baggingcoke == nil and cuttingcoke == nil then return true end end }, }
-    if Config.oxtarget then
-        exports.ox_target:addBoxZone({coords = vector3(1093.17, -3195.74, -39.19 -1), size = vec3(1,1,1), options = options})
-        exports.ox_target:addBoxZone({coords = vector3(1093.17, -3195.74, -39.19 -1), size = vec3(1,1,1), options = options2})
-    else
-        exports['qb-target']:AddBoxZone("cutcokepowder",vector3(1093.17, -3195.74, -39.19 -1),1.5, 1.75, {name = "cutcokepowder", minZ = -40.0,maxZ = -38.0,}, { options = options, distance = 2.0 })
-	    exports['qb-target']:AddBoxZone("bagcokepowder",vector3(1090.29, -3195.66, -39.13 - 1),1.5, 1.75, {name = "bagcokepowder", minZ = -40, maxZ = -38,}, {options = options2, distance = 2.0})
-    end
     if Config.FancyCokeAnims == false then 
-        for k, v in pairs (Config.CuttingCoke) do 
-            if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-             local options = {
-                {	type = "client",	event = "md-drugs:client:cutcokeone",	icon = "fas fa-sign-in-alt",	label = "Cut Coke", data = k,  distance = 2.0,
-                    canInteract = function()
-                        if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-                },
-            }
-            if Config.oxtarget then
-                exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-            else
-                exports['qb-target']:AddBoxZone("cutcoke"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="cutcoke"..k, heading = 156.0,minZ = v.loc.z-1, maxZ = v.loc.z+1, }, {options = options, distance = 1.5})
-            end
-        end
-        for k, v in pairs (Config.BaggingCoke) do 
-            if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-             local options = {
-                {	type = "client",	event = "md-drugs:client:bagcoke",	icon = "fas fa-sign-in-alt",	label = "Bag Coke", data = k,  distance = 2.0,
-                    canInteract = function()
-                        if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-                },
-            }
-            if Config.oxtarget then
-                exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-            else
-                exports['qb-target']:AddBoxZone("bagcoke"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="bagcoke"..k, heading = 156.0,minZ = v.loc.z-1, maxZ = v.loc.z+1, }, {options = options, distance = 1.5})
-            end
-        end
+        AddBoxZoneMulti('cuttcoke', Config.CuttingCoke,  {	type = "client",	event = "md-drugs:client:cutcokeone",	icon = "fa-solid fa-mortar-pestle",	label = Lang.targets.coke.cut}) 
+        AddBoxZoneMulti('baggcoke', Config.BaggingCoke,  {	type = "client",	event = "md-drugs:client:bagcoke",	    icon = "fa-solid fa-sack-xmark",	label = Lang.targets.coke.bag})
+    else
+        AddBoxZoneSingle('cutcoke', vector3(1093.17, -3195.74, -39.19),
+		    { type = "client", event = "md-drugs:client:cutcokeone", icon = "fa-solid fa-mortar-pestle", label = Lang.targets.coke.cut, canInteract = function()if cuttingcoke == nil and baggingcoke == nil then return true end end })
+        AddBoxZoneSingle('bagcokepowder', vector3(1090.29, -3195.66, -39.13),
+		    { type = "client", event = "md-drugs:client:bagcoke",    icon = "fa-solid fa-sack-xmark", label = Lang.targets.coke.bag, canInteract = function() if baggingcoke == nil and cuttingcoke == nil then return true end end })
     end
 end)

client/consumables.lua

@@ -1,17 +1,45 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
-RegisterNetEvent('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, statval, item)
+RegisterNetEvent('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, item)
 	if not progressbar(progresstext .. GetLabel(item).. "!", time, anim ) then return end
 	TriggerServerEvent('md-drugs:server:removeconsum', item)
-	if status == "armor" then 
-		TriggerServerEvent('hospital:server:SetArmor', statval)
-       	TriggerServerEvent('consumables:server:useArmor')
-       	SetPedArmour(PlayerPedId(), statval)
-	else	
-		TriggerServerEvent('md-drugs:server:updatestatus', status, statval)	
+	for k, v in pairs (status) do 
+		if k == 'health' then
+			local cur = GetEntityHealth(PlayerPedId())
+			SetEntityHealth(PlayerPedId(), cur + v)
+		elseif k == 'thirst' or k == 'stress' or k == 'hunger' then 
+			TriggerServerEvent('md-drugs:server:updatestatus', k, v)	
+		elseif k == "armor" then 
+			TriggerServerEvent('hospital:server:SetArmor', v)
+    	   	TriggerServerEvent('consumables:server:useArmor')
+    	   	SetPedArmour(PlayerPedId(), v)
+		elseif k == 'speed' then 
+			TriggerEvent('md-drugs:client:recievebuff', k, v)
+		elseif k == 'strength' then 
+			TriggerEvent('md-drugs:client:recievebuff', k, v)
+		end
 	end
-	TriggerEvent('evidence:client:SetStatus', 'widepupils', 200)
-	if effect == "alien" then AlienEffect() elseif effect == "ecstacy" then EcstasyEffect() elseif effect == "meth" then MethBagEffect() elseif effect == "coke" then CokeBaggyEffect() elseif effect == "trevor" then TrevorEffect() else end
-	if status == nil then return end
+		TriggerEvent('evidence:client:SetStatus', 'widepupils', 200) if effect == "alien" then AlienEffect() elseif effect == "ecstacy" then EcstasyEffect() elseif effect == "meth" then MethBagEffect() elseif effect == "coke" then CokeBaggyEffect() elseif effect == "trevor" then TrevorEffect() else end if status == nil then return end
 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)

client/cornerselling.lua

@@ -1,145 +1,92 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 local sell = false
+local sold = false
+local targbusy = false
+local inZone = false
+
+local function reset(targ)
+    FreezeEntityPosition(targ, false)
+    ClearPedTasks(targ)
+    Wait(10000)
+    DeletePed(targ)
+    targbusy = false
+    sold = true
+end
+
+local function sellDrug(item, amount, price, targ)
+    PoliceCall(20)
+    targbusy = true
+    if IsPedInAnyVehicle(PlayerPedId(), true) then 
+        Notify(Lang.Cornerselling.inveh, 'error') 
+        reset(targ)
+    return end
+    if not progressbar(string.format(Lang.Cornerselling.selling, GetLabel(item), price), 4000, 'uncuff') then return end
+    TriggerServerEvent('md-drugs:server:sellCornerDrugs', item, amount, price)
+    reset(targ)
+ end
+
+local function deny(targ)
+    PoliceCall(20)
+    targbusy = true
+    if not progressbar(Lang.Cornerselling.deny, 4000, 'argue5') then return end
+    reset(targ)
+end
 
 function Cornersell()
     local targ = lib.GetClosestPed(GetEntityCoords(PlayerPedId()), 8)
     if targ == nil then return end
-    if IsPedInAnyVehicle(targ, false) or GetEntityHealth(targ) == 0 then return end
-    local sold = false
+    if IsPedInAnyVehicle(targ, false) or GetEntityHealth(targ) == 0 or not IsPedHuman(targ) then return end
     TaskGoToCoordAnyMeans(targ, GetEntityCoords(PlayerPedId()), 1.0, 0, 0, 0, 0)
     repeat
         Wait(1000)
     until #(GetEntityCoords(PlayerPedId()) - GetEntityCoords(targ)) < 2.0
     lib.requestAnimDict("rcmme_tracey1")
-    TaskStartScenarioInPlace(targ, "WORLD_HUMAN_STAND_IMPATIENT_UPRIGHT", 0, false)
-    FreezeEntityPosition(targ, true)
-    local item, amount = lib.callback.await('md-drugs:server:cornerselling:getAvailableDrugs', false)
-        if item == 'nothing' then Notify(' You Aint Got Shit', 'error') sell = false  FreezeEntityPosition(targ, false)  ClearPedTasks(targ) return false end
-            local bagAmount = math.random(1, amount)
-            if bagAmount > 15 then bagAmount = math.random(1,15) end
-            local table = QBConfig.DrugsPrice[item]
-            local price = math.random(table['min'], table['max'] ) * bagAmount
-            local targbusy = false
-            local options = {
-                { label = 'Sell ' .. bagAmount .. ' Of ' .. GetLabel(item) .. ' For $' .. price .. '!', icon = "fas fa-eye", 
-                    onSelect = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if IsPedInAnyVehicle(PlayerPedId(), true) then 
-                            Notify('STRANGER DANGER, I WONT GET IN THE CAR WITH YOU', 'error') 
-                            FreezeEntityPosition(targ, false)
-                            ClearPedTasks(targ)
-                            Wait(10000)
-                            DeletePed(targ)
-                            targbusy = false
-                            sold = true
-                            sell = false
-                        return end
-                        if not progressbar('Selling ' .. GetLabel(item) .. '!', 4000, 'uncuff') then return end
-                        TriggerServerEvent('md-drugs:server:sellCornerDrugs', item, bagAmount, price)
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                        
-                    end,
-                canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
+    TaskStartScenarioInPlace(targ, "WORLD_HUMAN_STAND_IMPATIENT_UPRIGHT", 0, false) FreezeEntityPosition(targ, true)
+    local item, amount, price = lib.callback.await('md-drugs:server:cornerselling:getAvailableDrugs', false)
+        if item == 'nothing' then Notify(Lang.Cornerselling.nodrugs, 'error') sell = false  FreezeEntityPosition(targ, false)  ClearPedTasks(targ) return false end
+            local options = { 
+                { label = string.format(Lang.targets.CornerSell.sell, amount, GetLabel(item), price), icon ="fa-solid fa-money-bill",
+                    action =   function() sellDrug(item, amount, price, targ) end,
+                    canInteract = function()
+                        if not targbusy then return true end end,
                 },
-                { label = 'Deny Price', icon = "fas fa-eye", 
-                    onSelect = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if not progressbar('Telling This Dumbass To Leave!', 4000, 'argue5') then return end
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                    end,
-                canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
+                { label = Lang.targets.CornerSell.deny, icon = "fa-solid fa-person-harassing",
+                    action =    function() deny(targ) end,
+                    canInteract = function()
+                        if not targbusy then return true end end,
                 },
-            } 
-            local optionsqb = {
-                { label = 'Sell ' .. bagAmount .. ' Of ' .. GetLabel(item) .. ' For $' .. price .. '!', icon = "fas fa-eye", 
-                    action = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if IsPedInAnyVehicle(PlayerPedId(), true) then 
-                            Notify('STRANGER DANGER, I WONT GET IN THE CAR WITH YOU', 'error') 
-                            FreezeEntityPosition(targ, false)
-                            ClearPedTasks(targ)
-                            Wait(10000)
-                            DeletePed(targ)
-                            targbusy = false
-                            sold = true
-                            sell = false
-                        return end
-                        if not progressbar('Selling ' .. GetLabel(item) .. '!', 4000, 'uncuff') then return end
-                        TriggerServerEvent('md-drugs:server:sellCornerDrugs', item, bagAmount, price)
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                        
-                    end,
-                canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
-                },
-                { label = 'Deny Price', icon = "fas fa-eye", 
-                action = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if not progressbar('Telling This Dumbass To Leave!', 4000, 'argue5') then return end
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                    end,
-                canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
-                },
-            } 
-            if Config.oxtarget then
-                exports.ox_target:addLocalEntity(targ, options)
-            else
-	            exports['qb-target']:AddTargetEntity(targ, { options = optionsqb, distance = 2.0})
-            end  
+            }
+            AddMultiModel(targ, options, nil)
     repeat
         Wait(1000)
-    until sold 
+    until sold
     if sold then sold = false return true end
 end
 
 RegisterNetEvent('md-drugs:client:cornerselling', function()
     if not GetCops(QBConfig.MinimumDrugSalePolice) then return end
-    local item, amount = lib.callback.await('md-drugs:server:cornerselling:getAvailableDrugs', false)
+    if inZone then Notify(Lang.Cornerselling.no, 'error') return end
+    local item, amount, price = lib.callback.await('md-drugs:server:cornerselling:getAvailableDrugs', false)
     if item ~= 'nothing' then
-        if sell then 
-            Notify('Lazy Ass Cant Even Sell Drugs', 'error')
+        if sell then
+            Notify(Lang.Cornerselling.stop, 'error')
             sell = false
         else
             sell = true
-            Notify('Go Make That Paper', 'success')
+            Notify(Lang.Cornerselling.start, 'success')
             repeat
                 Wait(1000)
-               if not Cornersell() then end
-            until sell == false
+                if not Cornersell() then end
+            until not sell
         end
     else
-        Notify('You Cant Sell Air', 'error')
+        Notify(Lang.Cornerselling.nodrugs, 'error')
     end
 end)
 
+CreateThread(function()
+for k, v in pairs (QBConfig.NoSellZones) do
+    local box = lib.zones.box({ coords = v.loc, size = vec3(v.width, v.length, v.height), rotation = 180.0, debug = true,
+    onEnter = function() inZone = true end, onExit = function() inZone = false end})
+end
+end)

client/crack.lua

@@ -3,7 +3,7 @@ local QBCore = exports['qb-core']:GetCoreObject()
 
 RegisterNetEvent("md-drugs:client:makecrackone", function(data)
 	if not ItemCheck('bakingsoda') then return end
-	if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failcrackone", data.data) return end
+	if not minigame() then TriggerServerEvent("md-drugs:server:failcrackone", data.data) return end
     if not progressbar(Lang.Crack.cookcrack, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:makecrackone", data.data)       
 end)

client/deliveries.lua

@@ -1,360 +1,59 @@
 local QBCore = exports['qb-core']:GetCoreObject()
-local currentDealer = nil
-local dealerIsHome = false
-local waitingDelivery = nil
-local activeDelivery = nil
-local deliveryTimeout = 0
-local waitingKeyPress = false
-local dealerCombo = nil
-local drugDeliveryZone
+local isActive = false
 
--- Handlers
-
-AddStateBagChangeHandler('isLoggedIn', nil, function(_, _, value)
-    if value then
-        QBCore.Functions.TriggerCallback('md-drugs:server:RequestConfig', function(DealerConfig)
-            QBConfig.Dealers = DealerConfig
-        end)
-        Wait(1000)
-        InitZones()
-    else
-        if dealerCombo then dealerCombo:destroy() end
-    end
-end)
-
--- Functions
-
-local function GetClosestDealer()
-    local ped = PlayerPedId()
-    local pCoords = GetEntityCoords(ped)
-    for k, v in pairs(QBConfig.Dealers) do
-        local dealerCoords = vector3(v.coords.x, v.coords.y, v.coords.z)
-        if #(pCoords - dealerCoords) < 2.0 then
-            currentDealer = k
-            break
-        end
-    end
-end
 RegisterNetEvent('md-drugs:client:opendealermenu', function()
-    local dealermenu = {}
-    if Config.StupidassNewQbItemName then
-        for k, v in pairs (QBConfig.ProductsStupidNameRewrite) do 
-			if  QBCore.Functions.GetPlayerData().metadata["dealerrep"] >= v.minrep then 
-            dealermenu[#dealermenu + 1] = {
-                          icon =  GetImage(v.name),
-                          title = GetLabel(v.name),
-                          description = v.price,
-                          event = "md-drugs:client:travellingmerchantox",
-                          args = {
-                              item = v.name,
-                              cost = v.price,
-                             amount = v.amount,
-                             table = QBConfig.ProductsStupidNameRewrite,
-                             num = k,
-                            }
-                        }
-               
-                   lib.registerContext({id = 'dealermenu',title = "Dealer Menu", options = dealermenu})
-			end	   
-        end           
-    else
-         for k, v in pairs (QBConfig.Products) do 
-			if  QBCore.Functions.GetPlayerData().metadata["dealerrep"] >= v.minrep then 
-            dealermenu[#dealermenu + 1] = {
-                          icon =  GetImage(v.name),
-                          title = GetLabel(v.name),
-                          description = v.price,
-                          event = "md-drugs:client:travellingmerchantox",
-                          args = {
-                              item = v.name,
-                              cost = v.price,
-                             amount = v.amount,
-                             table = QBConfig.Products,
-                             num = k,
-                            }
-                        }
-
-                   lib.registerContext({id = 'dealermenu',title = "Dealer Menu", options = dealermenu})
-			end	   
-        end     
-    end
+    local rep = GetRep()
+    makeMenu('dealermenu', rep)
     lib.showContext('dealermenu')
 end)
-local function RandomDeliveryItemOnRep()
-    local myRep = QBCore.Functions.GetPlayerData().metadata["dealerrep"]
-    local availableItems = {}
-    for k, _ in pairs(QBConfig.DeliveryItems) do
-        if QBConfig.DeliveryItems[k]["minrep"] <= myRep then
-            availableItems[#availableItems+1] = k
-        end
-    end
-    return availableItems[math.random(1, #availableItems)]
-end
 
-local function RequestDelivery()
-    if not waitingDelivery then
-        GetClosestDealer()
-        
-        local amount = math.random(1, 3)
-        local item = RandomDeliveryItemOnRep()
-
-        Notify(Lang.Delivery.search, 'success')
-        if Config.NearbyDeliveries == true then
-            local playerPed = PlayerPedId()
-            local playerCoords = GetEntityCoords(playerPed)
-            local nearbyLocations = {}
-        -- Filter out the nearby locations
-            for _, location in ipairs(Config.DeliveryLocations) do
-                local distance = #(playerCoords - location.coords)
-                if distance <= Config.DeliveryWithin then
-                    nearbyLocations[#nearbyLocations + 1] = location
-                end
-            end
-
-            -- Select a random location from the nearby locations
-            if #nearbyLocations > 0 then
-                local selectedLocation = nearbyLocations[math.random(1, #nearbyLocations)]
-                waitingDelivery = {
-                    ["coords"] = selectedLocation.coords,
-                    ["locationLabel"] = selectedLocation.label,
-                    ["amount"] = amount,
-                    ["dealer"] = currentDealer,
-                    ["itemData"] = Config.DeliveryItems[item],
-                    ["item"] = item
-                }
-            else
-                Notify(Lang.Delivery.none, 'error')
-                
-            end
-        else
-            local location = math.random(1, #QBConfig.DeliveryLocations)
-
-            waitingDelivery = {
-                ["coords"] = QBConfig.DeliveryLocations[location]["coords"],
-                ["locationLabel"] = QBConfig.DeliveryLocations[location]["label"],
-                ["amount"] = amount,
-                ["dealer"] = currentDealer,
-                ["itemData"] = QBConfig.DeliveryItems[item],
-                ["item"] = item
-            }
-            if QBConfig.Debug == true then
-                print(QBConfig.DeliveryLocations[location]["coords"])
-                print(QBConfig.DeliveryLocations[location]["label"])
-            end
-        end
-		
-        TriggerServerEvent('md-drugs:server:giveDeliveryItems', waitingDelivery)
-        SetTimeout(2000, function()
-           TriggerServerEvent('qb-phone:server:sendNewMail', {
-               sender = QBConfig.Dealers[currentDealer]["name"],
-               subject = "Delivery Location",
-               message = "Deliver This For Me",
-               
-           })
-        end)
-        TriggerEvent("md-drugs:client:setLocation",waitingDelivery)
-    else
-        Notify(Lang.Delivery.busy, 'error')
-    end
-end
-
-local function DeliveryTimer()
-    CreateThread(function()
-        while deliveryTimeout - 1 > 0 do
-            deliveryTimeout = deliveryTimeout - 1
-            Wait(1000)
-        end
-        deliveryTimeout = 0
-    end)
-end
-
-
-
-local function DeliverStuff()
-    if deliveryTimeout > 0 then
-        Wait(500)
-        TriggerEvent('animations:client:EmoteCommandStart', {'uncuff'}) 
-        PoliceCall(20)
-        progressbar(Lang.Delivery.pack, 4000, 'uncuff')
-        TriggerServerEvent('md-drugs:server:successDelivery', activeDelivery, true)
-        activeDelivery = nil
-        exports['qb-target']:RemoveZone('drugDeliveryZone')
-        ClearPedTasks(PlayerPedId())
-    else
-        TriggerServerEvent('md-drugs:server:successDelivery', activeDelivery, false)
-    end
-    deliveryTimeout = 0
-end
-
-local function SetMapBlip(x, y)
-    SetNewWaypoint(x, y)
-    Notify(Lang.Delivery.found, 'success');
-end
-
-
-
-
-function InitZones()
-    if next(QBConfig.Dealers) == nil then return end
-   
-     for k,v in pairs(QBConfig.Dealers) do
+CreateThread(function()
+    local dealer = {}
+    local getDealers = lib.callback.await('md-drugs:server:getDealers', false)
+     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)
-         Freeze(testdealer, true, 90)
-           exports["qb-target"]:AddBoxZone("dealer_"..k, vector3(v.coords.x, v.coords.y, v.coords.z), 1.5, 1.5, {
-             name = "dealer_"..k,
-             heading = v.heading,
-             minZ = v.coords.z - 1,
-             maxZ = v.coords.z + 1,
-             debugPoly = false,
-         }, {
-             options = {
-                 {
-                     icon = 'fas fa-user-secret',
-                     label = "Deliver",
-                     action = function()
-				RequestDelivery()
-			end,
-                     canInteract = function()
-                         GetClosestDealer()
-                         local hours = GetClockHours()
-                         local min = QBConfig.Dealers[currentDealer]["time"]["min"]
-                         local max = QBConfig.Dealers[currentDealer]["time"]["max"]
-                         if max < min then
-                             if hours <= max then
-                                 if not waitingDelivery then
-                                     return true
-                                 end
-                             elseif hours >= min then
-                                 if not waitingDelivery then
-                                     return true
-                                 end
-                             end
-                         else
-                             if hours >= min and hours <= max then
-                                 if not waitingDelivery then
-                                     return true
-                                 end
-                             end
-                         end
-                     end
-                 },
-                 {
-                     icon = 'fas fa-user-secret',
-                     label = "Open Shop",
-                     action = function()
-                        TriggerEvent('md-drugs:client:opendealermenu')
-                     end,
-                     canInteract = function()
-                         GetClosestDealer()
-                         local hours = GetClockHours()
-                         local min = QBConfig.Dealers[currentDealer]["time"]["min"]
-                         local max = QBConfig.Dealers[currentDealer]["time"]["max"]
-                         if max < min then
-                             if hours <= max then
-                                 return true
-                             elseif hours >= min then
-                                 return true
-                             end
-                         else
-                             if hours >= min and hours <= max then
-                                 return true
-                             end
-                         end
-                     end
-                 }
-             },
-             distance = 1.5
-         })
-     end
-   
-end
-
--- Events
-
-RegisterNetEvent('md-drugs:client:RefreshDealers', function(DealerData)
-    if dealerCombo then dealerCombo:destroy() end
-    QBConfig.Dealers = DealerData
-    Wait(1000)
-    InitZones()
-end)
-
-RegisterNetEvent('md-drugs:client:updateDealerItems', function(itemData, amount)
-    TriggerServerEvent('md-drugs:server:updateDealerItems', itemData, amount, currentDealer)
-end)
-
-RegisterNetEvent('md-drugs:client:setDealerItems', function(itemData, amount, dealer)
-    QBConfig.Dealers[dealer]["products"][itemData.slot].amount = QBConfig.Dealers[dealer]["products"][itemData.slot].amount - amount
-end)
-
-RegisterNetEvent('md-drugs:client:setLocation', function(locationData)
-    if activeDelivery then
-        SetMapBlip(activeDelivery["coords"]["x"], activeDelivery["coords"]["y"])
-        Notify(Lang.Delivery.already, 'error')
-        return
-    end
-    activeDelivery = locationData
-    deliveryTimeout = 300
-    DeliveryTimer()
-    SetMapBlip(activeDelivery["coords"].x, activeDelivery["coords"].y)
-	local Ped = "g_m_y_famdnf_01"
-     RequestModel(Ped)
-     while not HasModelLoaded(Ped) do
-         Wait(0)
-     end
-     
-     Buyer = CreatePed(0, Ped,activeDelivery["coords"].x, activeDelivery["coords"].y, activeDelivery["coords"].z-1, 180.0, false, false)
-        Freeze(Buyer, true, 180)
-       exports['qb-target']:AddTargetEntity(Buyer, {
-            options = {
-                {
-                    icon = 'fas fa-user-secret',
-                    label = "Hand Off",
-                    action = function()
-                        DeliverStuff()
-						Wait(4000)
-						DeleteEntity(Buyer)
-                        waitingDelivery = nil
-                    end,
-                    canInteract = function()
-                        if waitingDelivery then
-                            return true
-                        end
-                    end
-                }
+        lib.requestModel(Ped, Config.RequestModelTime)
+        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)
+        local options = {
+            { icon = 'fas fa-user-secret', label = string.format(Lang.targets.Delivery.Deliver, v.name),
+                action = function()
+			      local bool, item, amount, coords = lib.callback.await('md-drugs:server:GetDeliveryItem', false, k)
+                   if bool then 
+                      Email(Lang.Delivery.emailn, Lang.Delivery.emailsub, string.format(Lang.Delivery.emailcon, amount, GetLabel(item)))
+                      TriggerEvent('md-drugs:client:setLocation', {bool = bool, item = item, amount = amount, coords = coords})
+		          end
+               end,
             },
-            distance = 1.5
-        })
-    
+            { icon = "fa-solid fa-store", label = string.format(Lang.targets.Delivery.open, v.name),
+                action =   function()   TriggerEvent('md-drugs:client:opendealermenu') end,
+            }
+        }
+        AddMultiModel(dealer[k], options)
+     end
 end)
 
-RegisterNetEvent('md-drugs:client:sendDeliveryMail', function(type, deliveryData)
-    if type == 'perfect' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = QBConfig.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "You did it"
-        })
-    elseif type == 'bad' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = QBConfig.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "You Fucked Me Over"
-        })
-    elseif type == 'late' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = QBConfig.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "Better Late Than Dead"
-        })
-    end
-end)
-
-RegisterCommand('checkrep', function()
-    local drugrep = QBCore.Functions.GetPlayerData().metadata["dealerrep"]
-    Notify(Lang.Delivery.checkrep..drugrep)
-end, false)
+RegisterNetEvent('md-drugs:client:setLocation', function(data)
+    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, 180.0, false, false)
+    Freeze(Buyer, true, 180)
+    AddSingleModel(Buyer,  {
+        icon = 'fas fa-user-secret',
+        label = Lang.targets.Delivery.hand,
+        action = function()
+           if not progressbar(Lang.Delivery.pack, 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
+    }, nil)
+end)

client/functions.lua

@@ -49,30 +49,121 @@ function progressbar(text, time, anim)
 	  until cancelled or test
 	  if test then return true end
 	else
-		print"dude, it literally tells you what you need to set it as in the config"
+			print"^1 SCRIPT ERROR: Md-DRUGS set your progressbar with one of the options!"
 	end	  
   end
 
-function minigame(num1, num2)
-    local check
-	if minigametype == 'ps' then
-    	exports['ps-ui']:Circle(function(success)
-        	check = success
-    	end, num1, num2) 
-    	return check
-	elseif minigametype == 'ox' then
-		num1 = 'easy'
-		if num2 <= 6 then num2 = 'hard' elseif num2 >= 7 and num2 <= 12 then num2 = 'medium' else num2 = 'easy' end
-		local success = lib.skillCheck({num1, num2}, {'1', '2', '3', '4'})
-		return success 
-    elseif minigametype == 'none' then
-		return true
-	else	
-		
-        print"dude, it literally tells you what you need to set it as in the config"
+function loadParticle(dict)
+    if not HasNamedPtfxAssetLoaded(dict) then
+        RequestNamedPtfxAsset(dict)
     end
+    while not HasNamedPtfxAssetLoaded(dict) do
+        Wait(0)
+    end
+    SetPtfxAssetNextCall(dict)
 end
 
+function LoadModel(hash)
+	RequestModel(hash)
+	while not HasModelLoaded(hash)  do
+		Wait(0)
+	end
+end
+
+function minigame()
+	local time = 0
+	local game = Config.Minigames
+	if minigametype == 'ps_circle' then
+		local check 
+		exports['ps-ui']:Circle(function(success)
+			check = success
+		end, game['ps_circle'].amount, game['ps_circle'].speed) 
+		return check
+	elseif minigametype == 'ps_maze' then
+	   local check 
+	   exports['ps-ui']:Maze(function(success)
+		   check = success
+	   end, game['ps_maze'].timelimit)
+	   return check
+   elseif minigametype == 'ps_scrambler' then
+	   local check 
+	   exports['ps-ui']:Scrambler(function(success)
+		   check = success
+	   end, 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(function(success)
+		   check = success
+	   end, game['ps_var'].numBlocks,  game['ps_var'].time)
+	   return check
+   elseif minigametype == 'ps_thermite' then
+	   local check 
+	   exports['ps-ui']:Thermite(function(success)
+		   check = success
+	   end, 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 Notify(text, type)
 	if notifytype =='ox' then
@@ -81,36 +172,34 @@ end
 	  QBCore.Functions.Notify(text, type)
 	elseif notifytype == 'okok' then
 	  exports['okokNotify']:Alert('', text, 4000, type, false)
-	else 
-       	print"dude, it literally tells you what you need to set it as in the config"
-    	end   
+	else
+       	print"^1 SCRIPT ERROR: Md-DRUGS set your notification with one of the options!"
+    end
   end
 
 function GetImage(img)
-	if GetResourceState('ox_inventory') == 'started' then
-		local Items = exports['ox_inventory']:Items()
-		if Items[img]['client'] then 
-			if Items[img]['client']['image'] then
-				return Items[img]['client']['image']
-			else
-				return "nui://ox_inventory/web/images/".. img.. '.png'
-			end
-		else
-			return "nui://ox_inventory/web/images/".. img.. '.png'
-		end
-	elseif GetResourceState('ps-inventory') == 'started' then
-		return "nui://ps-inventory/html/images/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('lj-inventory') == 'started' then
-		return "nui://lj-inventory/html/images/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('qb-inventory') == 'started' then
-		return "nui://qb-inventory/html/images/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('qs-inventory') == 'started' then
-		return "nui://qs-inventory/html/img/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('origen_inventory') == 'started' then
-		return "nui://origen_inventory/html/img/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('core_inventory') == 'started' then
-		return "nui://core_inventory/html/img/".. QBCore.Shared.Items[img].image
-	end
+    if GetResourceState('ox_inventory') == 'started' then
+        local Items = exports['ox_inventory']:Items()
+        local itemClient = Items[img] and Items[img]['client']
+        if itemClient and itemClient['image'] then
+            return itemClient['image']
+        else
+            return "nui://ox_inventory/web/images/" .. img .. '.png'
+        end
+    end
+    local invs = {
+        ['ps-inventory'] = "nui://ps-inventory/html/images/",
+        ['lj-inventory'] = "nui://lj-inventory/html/images/",
+        ['qb-inventory'] = "nui://qb-inventory/html/images/",
+        ['qs-inventory'] = "nui://qs-inventory/html/img/",
+        ['origen_inventory'] = "nui://origen_inventory/html/img/",
+        ['core_inventory'] = "nui://core_inventory/html/img/"
+    }
+    for k, v in pairs(invs) do
+        if GetResourceState(k) == 'started' then
+            return v .. QBCore.Shared.Items[img].image
+        end
+    end
 end
 
 function GetLabel(label)
@@ -122,17 +211,76 @@ function GetLabel(label)
 	end
 end
 
+function GetRep()
+	local rep = lib.callback.await('md-drugs:server:GetRep', false)
+	return rep
+end
+
+
+function sorter(sorting, value) 
+	table.sort(sorting, function(a, b) return a[value] < b[value] end)
+end
+
+function makeMenu(name, rep)
+	local menu = {}
+	local data = lib.callback.await('md-drugs:server:menu', false, name)
+	for k, v in pairs (data.table) do
+		local allow = false
+		if rep == nil then 
+			allow = true
+		else
+			if rep.dealerrep >= v.minrep then allow = true end
+		end
+		if allow then 
+			menu[#menu + 1] = {
+				icon =  GetImage(v.name),
+				description = '$'.. v.price,
+				title = GetLabel(v.name),
+				onSelect = function()
+					local settext = "Cost: $"..v.price
+					local dialog = exports.ox_lib:inputDialog(v.name .."!",   {
+						{ type = 'select', label = "Payment Type", default = "cash", options = {	{ value = "cash"},	{ value = "bank"},}},
+						{ type = 'number', label = "Amount to buy", description = settext, min = 0, max = v.amount, default = 1 },
+					})
+					if not dialog[1] then return end
+					TriggerServerEvent("md-drugs:server:purchaseGoods", dialog[2], dialog[1], v.name, v.price, data.table, k)
+				end,
+			}
+		end
+	end
+	sorter(menu, 'title')
+	lib.registerContext({id = data.id, title = data.title, options = menu})
+end
+
 
 function ItemCheck(item)
-local success 
 if GetResourceState('ox_inventory') == 'started' then
-    if exports.ox_inventory:GetItemCount(item) >= 1 then return true else Notify('You Need ' .. GetLabel(item) .. " !", 'error') end
+    if exports.ox_inventory:GetItemCount(item) >= 1 then return true else Notify('You Need ' .. GetLabel(item) .. " !", 'error') return false end
 else
     if QBCore.Shared.Items[item] == nil then print("There Is No " .. item .. " In Your QB Items.lua") return end
-    if QBCore.Functions.HasItem(item) then success = item return success else Notify('You Need ' .. QBCore.Shared.Items[item].label .. " !", 'error') end
+    if QBCore.Functions.HasItem(item) then return true else Notify('You Need ' .. QBCore.Shared.Items[item].label .. " !", 'error') return false end
 end
 end
 
+function ItemCheckMulti(item)
+	local need = 0
+	local has = 0
+	for k,v in pairs (item) do 
+		need = need + 1
+		if GetResourceState('ox_inventory') == 'started' then
+			if exports.ox_inventory:GetItemCount(v) >= 1 then has = has + 1 else Notify('You Need ' .. GetLabel(v) .. " !", 'error') end
+		else
+			if QBCore.Shared.Items[v] == nil then print("There Is No " .. item .. " In Your QB Items.lua") return end
+			if QBCore.Functions.HasItem(v) then has = has + 1  else Notify('You Need ' .. QBCore.Shared.Items[v].label .. " !", 'error') end
+		end
+	end
+	if need == has then 
+		return true
+	else
+		return false
+	end
+end
+
 function Email(sender, subject, message)
 	if Config.Phone == 'yflip' then
 		local receiver = GetPlayerServerId(PlayerId())
@@ -141,7 +289,6 @@ function Email(sender, subject, message)
 			sender = sender,
 			senderDisplayName = sender,
 			content = message,
-			
 		}, 'phoneNumber', receiver)
 	elseif Config.Phone == 'qs' then
 		TriggerServerEvent('qs-smartphone:server:sendNewMail', {
@@ -157,7 +304,7 @@ function Email(sender, subject, message)
 			message = message,
 		})
 	end
-end	  
+end
 
 function PoliceCall(chance)
 	local math = math.random(1,100)
@@ -174,15 +321,7 @@ function PoliceCall(chance)
 				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,
-				}
+				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", {
@@ -212,4 +351,237 @@ function Freeze(entity, toggle, head)
         FreezeEntityPosition(entity, toggle)
         SetEntityHeading(entity, head)
 		SetBlockingOfNonTemporaryEvents(entity, toggle)
-end
+end
+
+function tele(coords) 
+	DoScreenFadeOut(500)
+	Wait(1000)
+	SetEntityCoords(PlayerPedId(),coords.x, coords.y, coords.z)
+	Wait(1000)
+	DoScreenFadeIn(500)
+end
+
+
+function AddBoxZoneSingle(name, loc, data)
+	if Config.Target == 'qb' then
+		exports['qb-target']:AddBoxZone(name, loc, 1.5, 1.75, {name = name, minZ = loc.z-1,maxZ = loc.z +1}, 
+		{ options = {
+			{
+			  type = data.type or nil, 
+			  event = data.event or nil,
+			  action = data.action or nil,
+			  icon = data.icon, 
+			  label = data.label,
+			  data = data.data,
+			  canInteract = data.canInteract,
+			}
+		},
+		distance = 2.0
+	 })
+	elseif Config.Target == 'ox' then
+		exports.ox_target:addBoxZone({coords = loc, size = vec3(1,1,1), options = {
+			{
+			  type = data.type or nil, 
+			  event = data.event or nil,
+			  onSelect = data.action or nil,
+			  distance = 2.5,
+			  icon = data.icon, 
+			  label = data.label,
+			  data = data.data,
+			  canInteract = data.canInteract,
+			}
+		}, })
+	end
+end
+
+function AddBoxZoneMulti(name, table, data) 
+	for k, v in pairs (table) do
+		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
+		if Config.Target == 'qb' then
+			exports['qb-target']:AddBoxZone(name .. k, v.loc, 1.5, 1.75, {name = name..k, minZ = v.loc.z-1.50,maxZ = v.loc.z +1.5}, 
+			{ options = {
+				{
+				  type = data.type or nil, 
+				  event = data.event or nil,
+				  action = data.action or nil,
+				  icon = data.icon, 
+				  label = data.label,
+				  data = k,
+				  canInteract = data.canInteract or function()
+					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
+				}
+			}, 
+			distance = 2.5
+		 })
+		elseif Config.Target == 'ox' then
+			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1), options = {
+				{
+				  type = data.type or nil, 
+				  event = data.event or nil,
+				  onSelect = data.action or nil,
+				  icon = data.icon, 
+				  label = data.label,
+				  data = k,
+				  distance = 2.5,
+				  canInteract = data.canInteract or function()
+					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
+				}
+			}, })
+		end
+	end
+end
+
+function AddBoxZoneMultiOptions(name, loc, data) 
+		if Config.Target == 'qb' then
+			exports['qb-target']:AddBoxZone(name , loc, 1.5, 1.75, {name = name, minZ = loc.z-1.50,maxZ = loc.z +1.5}, 
+			{ options = data, distance = 2.5})
+		elseif Config.Target == 'ox' then
+			exports.ox_target:addBoxZone({coords = loc, size = vec3(1,1,1), options = data })
+		end
+	end
+
+
+function AddSingleModel(model, data, num)
+	if Config.Target == 'qb' then
+		exports['qb-target']:AddTargetEntity(model, {options = {
+			{icon = data.icon, label = data.label, event = data.event or nil, action = data.action or nil, data = num }
+		}, distance = 2.5})
+	elseif Config.Target == 'ox' then
+		exports.ox_target:addLocalEntity(model, {icon = data.icon, label = data.label, event = data.event or nil, onSelect = data.action or nil, data = num, distance = 2.5 })
+	end
+end
+
+function AddMultiModel(model, data, num)
+	local options = {}
+	for k, v in pairs (data) do 
+		table.insert(options,{
+			icon = v.icon, label = v.label, event = v.event or nil, action = v.action or nil,
+			onSelect = v.action,data = v.data,canInteract = v.canInteract or nil, distance = 2.0,
+		})
+	end
+	if Config.Target == 'qb' then
+		exports['qb-target']:AddTargetEntity(model, {options = options, distance = 2.5})
+	elseif Config.Target == 'ox' then
+		exports.ox_target:addLocalEntity(model, options)
+	end
+end
+
+local created = false
+local heading = 180.0
+function StartRay()
+    local run = true
+	local pedcoord = GetEntityCoords(PlayerPedId())
+	local table = CreateObject('v_ret_ml_tablea', pedcoord.x, pedcoord.y, pedcoord.z+1, heading, false, false)
+    repeat
+        local hit, entityHit, endCoords, surfaceNormal, matHash = lib.raycast.cam(511, 4, 10)
+		if not created then 
+			created = true
+			lib.showTextUI([[[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
+            lib.hideTextUI()
+            run = false
+			DeleteObject(table)
+			created = false
+            return endCoords, heading
+        end
+
+        if IsControlPressed(0, 178) then
+            lib.hideTextUI()
+            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())
+	local table = CreateObject('bkr_prop_coke_press_01aa', pedcoord.x, pedcoord.y, pedcoord.z+1, heading, false, false)
+    repeat
+        local hit, entityHit, endCoords, surfaceNormal, matHash = lib.raycast.cam(511, 4, 10)
+		if not created then 
+			created = true
+			lib.showTextUI([[[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
+            lib.hideTextUI()
+            run = false
+			DeleteObject(table)
+			created = false
+            return endCoords, heading
+        end
+
+        if IsControlPressed(0, 178) then
+            lib.hideTextUI()
+            run = false
+			created = false
+			DeleteObject(table)
+            return nil, nil
+		end
+        Wait(0)
+    until run == false
+end
+
+
+RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
+	Wait(3000)
+	LoadModel('prop_plant_01b') TriggerEvent('heroin:init')
+	LoadModel('prop_plant_01a') TriggerEvent('coke:init')
+	LoadModel('prop_cactus_03') TriggerEvent('Mescaline:init')
+	LoadModel('mushroom') TriggerEvent('shrooms:init')
+	LoadModel('bkr_prop_weed_lrg_01b') TriggerEvent('weed:init')
+	local check = lib.callback.await('md-drugs:server:GetRep', false)
+
+	return
+end)
+
+AddEventHandler('onResourceStart', function(resource)
+    if resource == GetCurrentResourceName() then
+		LoadModel('prop_plant_01b') TriggerEvent('heroin:init')
+		LoadModel('prop_plant_01a') TriggerEvent('coke:init')
+		LoadModel('prop_cactus_03') TriggerEvent('Mescaline:init')
+		LoadModel('mushroom') TriggerEvent('shrooms:init')
+		LoadModel('bkr_prop_weed_lrg_01b') TriggerEvent('weed:init')
+    end
+end)
+local active = false
+RegisterNetEvent('md-drugs:client:minusTier', function(data) 
+	if active then return end
+	if not data then return end
+	active = true
+	if not progressbar('Cutting This ' ..GetLabel(data.item) .. ' More', 4000, 'uncuff') then return end
+	TriggerServerEvent('md-drugs:server:AddMas', data)
+	active = false
+end)

client/heroin.lua

@@ -1,64 +1,47 @@
 local QBCore = exports['qb-core']:GetCoreObject()
-local CocaPlant = {}
 local PoppyPlants = {}
 local herointable = false
-local function loadParticle(dict)
-    if not HasNamedPtfxAssetLoaded(dict) then
-        RequestNamedPtfxAsset(dict)
-    end
-    while not HasNamedPtfxAssetLoaded(dict) do
-        Wait(0)
-    end
-    SetPtfxAssetNextCall(dict)
+
+ 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)
+    local  options = {
+        { event = "md-drugs:client:heatliquidheroin", icon = "fa-solid fa-temperature-high", label = Lang.targets.heroin.cook, data = heroinlabkit},
+        { event = "md-drugs:client:getheroinkitback", icon = "fas fa-box-circle-check", label = Lang.targets.heroin.up,   data = heroinlabkit, canInteract = function() if herointable then return true end end},
+     }
+    AddMultiModel(heroinlabkit, options, heroinlabkit)
 end
+
+local function pickher(loc)
+    if not progressbar(Lang.Heroin.pick, 4000, 'uncuff') then return end
+    TriggerServerEvent("heroin:pickupCane", loc)
+end
+
 CreateThread(function() 
 local Ped = "g_m_y_famdnf_01"
 	lib.requestModel("g_m_y_famdnf_01", Config.RequestModelTime)
 	local labkitlocation = Config.buyheroinlabkit
 	local heroinkitdealer = CreatePed(0, Ped, labkitlocation.x, labkitlocation.y, labkitlocation.z-1, labkitlocation.w, false, false)
     Freeze(heroinkitdealer, true, labkitlocation.w)
-    local options = {
-        { label = "Buy Heroin Lab Kit", icon = "fas fa-eye", event = "md-drugs:client:buyheroinlabkit", distance = 2.0},
-    } 
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(heroinkitdealer, options)
-    else
-	    exports['qb-target']:AddTargetEntity(heroinkitdealer, { options = options, distance = 2.0})
-    end    
+    AddSingleModel(heroinkitdealer, { label = Lang.targets.heroin.kit, icon = "fa-solid fa-money-bill", event = "md-drugs:client:buyheroinlabkit", distance = 2.0}, nil )
 end)
 
----- plant spawns dont edit
 RegisterNetEvent('heroin:respawnCane', function(loc)
     local v = GlobalState.PoppyPlants[loc]
     local hash = GetHashKey(v.model)
-
     if not PoppyPlants[loc] then
         PoppyPlants[loc] = CreateObject(hash, v.location, false, true, true)
         Freeze(PoppyPlants[loc], true, v.heading)
-        exports['qb-target']:AddTargetEntity(PoppyPlants[loc], {
-            options = { {
-                    icon = "fas fa-hand",
-                    label = "pick Poppies",
-                    action = function()
-                       if not progressbar(Lang.Heroin.pick, 4000, 'uncuff') then return end
-                        TriggerServerEvent("heroin:pickupCane", loc)
-                    end
-                }
-            },
-            distance = 2.5
-        })
+        AddSingleModel(PoppyPlants[loc], {icon = "fa-solid fa-seedling", label = Lang.targets.heroin.pick, action = function() pickher(loc) end}, loc )
     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)
@@ -66,35 +49,11 @@ RegisterNetEvent("heroin:init", function()
         if not v.taken then
             PoppyPlants[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
             Freeze(PoppyPlants[k], true, v.heading)
-            exports['qb-target']:AddTargetEntity(PoppyPlants[k], {
-                options = { {
-                        icon = "fas fa-hand",
-                        label = "Pick Poppies",
-                        action = function()
-                           if not progressbar(Lang.Heroin.pick, 4000, 'uncuff') then return end
-                            TriggerServerEvent("heroin:pickupCane", k) 
-                        end
-                    }
-                },
-                distance = 2.5
-            })
+            AddSingleModel(PoppyPlants[k], {icon = "fa-solid fa-seedling", label = Lang.targets.heroin.pick, action = function() pickher(k) end}, k )
         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'))
@@ -104,11 +63,7 @@ AddEventHandler('onResourceStart', function(resource)
             end
         end
     end
-	DeleteObject(heroinlabkit)
-	DeleteObject(dirtylabkitheroin)
 end)
----- plant stop end
-
 
 RegisterNetEvent("md-drugs:client:dryplant", function(data) 
     if not progressbar(Lang.Heroin.dryout, 4000, 'uncuff') then return end
@@ -126,51 +81,34 @@ RegisterNetEvent("md-drugs:client:buyheroinlabkit", function()
 	TriggerServerEvent("md-drugs:server:getheroinlabkit")
 end)
 
-RegisterNetEvent("md-drugs:client:setheroinlabkit")
-AddEventHandler("md-drugs:client:setheroinlabkit", function() 
-if herointable then   
-   Notify(Lang.Heroin.tableout, 'error')
-else
-local PedCoords = GetEntityCoords(PlayerPedId())
-    if not progressbar(Lang.Heroin.table, 4000, 'uncuff') then TriggerServerEvent('md-drugs:server:getheroinlabkitback') return end
-    herointable = true
-	local heroinlabkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-	PlaceObjectOnGroundProperly(heroinlabkit)
-    local  options = {
-        { event = "md-drugs:client:heatliquidheroin", icon = "fas fa-box-circle-check", label = "Cook Heroin", data = heroinlabkit},
-        { event = "md-drugs:client:getheroinkitback", icon = "fas fa-box-circle-check", label = "Pick Up",     data = heroinlabkit, canInteract = function() if herointable then return true end end},
-     }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(heroinlabkit, options)
+RegisterNetEvent("md-drugs:client:setheroinlabkit", function() 
+    if herointable then   
+       Notify(Lang.Heroin.tableout, 'error')
     else
-	    exports['qb-target']:AddTargetEntity(heroinlabkit, {options = options})
-    end    
-end
+        herointable = true
+        local location, head = StartRay()
+        if not location then herointable = false TriggerServerEvent('md-drugs:server:getheroinlabkitback') return end
+        if not progressbar(Lang.Heroin.table, 4000, 'uncuff') then TriggerServerEvent('md-drugs:server:getheroinlabkitback') return end
+    	createLabKit(location, head)
+    end
 end)
 
-
 RegisterNetEvent("md-drugs:client:heatliquidheroin", function(data) 
-local PedCoords = GetEntityCoords(PlayerPedId())
+    local loc, head = GetEntityCoords(data.data), GetEntityHeading(data.data)
     if not ItemCheck('emptyvial') then return end
-    if not minigame(2, 8) then
+    if not minigame() then
         TriggerServerEvent("md-drugs:server:failheatingheroin")
 		DeleteObject(data.data)
-		Wait(100)
-		local dirtylabkitheroin = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
+		local dirtylabkitheroin = CreateObject("v_ret_ml_tablea", loc.x, loc.y, loc.z-1, true, false)
+        SetEntityHeading(dirtylabkitheroin, head)
+        PlaceObjectOnGroundProperly(dirtylabkitheroin)
 		loadParticle("core")
 	    heroinkit = StartParticleFxLoopedOnEntity("exp_air_molotov", dirtylabkitheroin, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
         SetParticleFxLoopedAlpha(heroinkit, 3.0)
 		SetPedToRagdoll(PlayerPedId(), 1300, 1300, 0, 0, 0, 0)
-        local options = {
-            {   event = "md-drugs:client:cleanheroinlabkit",   icon = "fas fa-box-circle-check",   label = "Clean It", data = dirtylabkitheroin}
-        }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(dirtylabkitheroin,options )
-        else
-		    exports['qb-target']:AddTargetEntity(dirtylabkitheroin, {options = options})
-        end    
+        AddMultiModel(dirtylabkitheroin, {{event = "md-drugs:client:cleanheroinlabkit",icon = "fa-solid fa-hand-sparkles",label = Lang.targets.heroin.clean, data = dirtylabkitheroin}}, nil )
 	return end
-   if not progressbar(Lang.Heroin.success, 4000, 'uncuff') then return end
+    if not progressbar(Lang.Heroin.success, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:heatliquidheroin")
 end)
 
@@ -181,15 +119,12 @@ RegisterNetEvent("md-drugs:client:cleanheroinlabkit", function(data)
 	TriggerServerEvent("md-drugs:server:removecleaningkitheroin", data.data)
 end)
 
-RegisterNetEvent("md-drugs:client:deletedirtyheroin", function(data) 
-DeleteObject(data)
-herointable = false
-Wait(1000)
-TriggerEvent("md-drugs:client:setheroinlabkit")
+RegisterNetEvent("md-drugs:client:deletedirtyheroin", function(data)
+    local location,head = GetEntityCoords(data), GetEntityHeading(data)
+    DeleteObject(data)
+	createLabKit(location, head)
 end)
 
-
-
 RegisterNetEvent("md-drugs:client:getheroinkitback", function(data) 
    if not progressbar(Lang.Heroin.pickup, 4000, 'uncuff') then return end
     herointable = false
@@ -197,11 +132,8 @@ RegisterNetEvent("md-drugs:client:getheroinkitback", function(data)
     TriggerServerEvent("md-drugs:server:getheroinlabkitback")
 end)
 
-
-RegisterNetEvent("md-drugs:client:fillneedle", function(data) 
-    if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failheroin", data.data) return end
-   if not  progressbar(Lang.Heroin.needles, 4000, 'uncuff') then return end
+RegisterNetEvent("md-drugs:client:fillneedle", function(data)
+    if not minigame() then TriggerServerEvent("md-drugs:server:failheroin", data.data) return end
+    if not progressbar(Lang.Heroin.needles, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:fillneedle", data.data)
-end)
-
-
+end)

client/lean.lua

@@ -5,18 +5,48 @@ CreateThread(function()
 	lib.requestModel(current, Config.RequestModelTime)
 	local SyrupLocation = CreatePed(0, current,Config.SyrupVendor.x,Config.SyrupVendor.y,Config.SyrupVendor.z-1, Config.SyrupVendor.w, false, false)
     Freeze(SyrupLocation, true, Config.SyrupVendor.w)
-    local options = {
-        { type = "client", label = "Get Task", icon = "fas fa-eye", event = "md-drugs:client:getsyruplocationtobuy", distance = 2.0},
-    }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(SyrupLocation, options)
-    else
-	    exports['qb-target']:AddTargetEntity(SyrupLocation, { options = options, distance = 2.0})
-    end    
+    AddSingleModel(SyrupLocation, { type = "client", label = Lang.targets.lean.git, icon = "fa-solid fa-circle-info", event = "md-drugs:client:getsyruplocationtobuy", distance = 2.0}, nil )    
 end)
 
 
-RegisterNetEvent("md-drugs:client:getsyruplocationtobuy", function() 
+RegisterNetEvent("md-drugs:client:getsyruplocationtobuy", function()
 Notify(Lang.Lean.marked, "success")
 SpawnCarPedChase()
 end)
+
+RegisterNetEvent('md-drugs:client:leancraft', function()
+local store = {} 
+local label = {}
+local items = lib.callback.await('md-drugs:server:GetRecipe', false,'lean', 'cups')
+for k, v in pairs (items) do
+	label = {}
+	local item = ''
+	 for m, d in pairs (items[k].take) do  table.insert(label, GetLabel(m) .. ' X ' .. d) end
+	 for m,d in pairs (items[k].give) do item = m end
+	 store[#store + 1] = {
+		icon =  GetImage(item),
+		description = table.concat(label, ", "),
+		title = GetLabel(item),
+		event = 'md-drugs:client:stirlean',
+		args = {
+			item = item, 
+			recipe = 'lean',
+			num = k,
+			label = 'Cooking Up ' .. GetLabel(item),
+			table = 'cups'
+		}
+	}
+	sorter(store, 'title')
+	lib.registerContext({id = 'leanCraft',title = "Make Lean", options = store})
+end
+lib.showContext('leanCraft')
+end)
+
+local busy = false
+RegisterNetEvent('md-drugs:client:stirlean', function(data) 
+	if busy then return end
+	 busy = true
+	if not progressbar(data.label, 4000, 'uncuff') then busy = false return end
+	TriggerServerEvent('md-drugs:server:finishcup', data)
+	busy = false
+end)

client/lsd.lua

@@ -2,68 +2,51 @@ local QBCore = exports['qb-core']:GetCoreObject()
 local tableout = false
 
 
-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 labkit = CreateObject("v_ret_ml_tablea", coord.x, coord.y, coord.z - 1, true, false)
+    SetEntityHeading(labkit, head)
+    PlaceObjectOnGroundProperly(labkit)
+    local options = {
+        { event = "md-drugs:client:heatliquid", icon = "fa-solid fa-temperature-high", label = Lang.targets.lsd.heat, data = labkit },
+        { event = "md-drugs:client:refinequalityacid", icon = "fa-solid fa-temperature-high", label = Lang.targets.lsd.refine, data = labkit },
+        { event = "md-drugs:client:maketabpaper", icon = "fa-regular fa-note-sticky", label = Lang.targets.lsd.dab, data = labkit },
+        { event = "md-drugs:client:getlabkitback", icon = "fas fa-box-circle-check", label = Lang.targets.lsd.back, data = labkit, canInteract = function() return tableout end }
+    }
+    AddMultiModel(labkit, options, labkit)
 end
 
 CreateThread(function() 
-local Ped = "g_m_y_famdnf_01"
+    local Ped = "g_m_y_famdnf_01"
 	lib.requestModel(Ped, Config.RequestModelTime)
 	local tabdealer = CreatePed(0, Ped,Config.buylsdlabkit.x,Config.buylsdlabkit.y,Config.buylsdlabkit.z-1, Config.buylsdlabkit.w, false, false)
     Freeze(tabdealer, true, Config.buylsdlabkit.w)
-    local options = {
-        { type = "client", label = "Buy LSD Lab Kit", icon = "fas fa-eye", event = "md-drugs:client:buylabkit", distance = 2.0}
-     }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(tabdealer, options)
-    else 
-	    exports['qb-target']:AddTargetEntity(tabdealer, {options = options, distance = 2.0})
-    end    
+    AddSingleModel(tabdealer,{ type = "client", label = Lang.targets.lsd.buy, icon = "fa-solid fa-money-bill", event = "md-drugs:client:buylabkit", distance = 2.0}, tabdealer )
 end)
 
 
 RegisterNetEvent("md-drugs:client:getlysergic", function(data) 
-    if not minigame(2, 8) then return end
+    if not minigame() then return end
 	if not progressbar(Lang.lsd.steallys, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:getlysergic",data.data)
 end)
 
 
 RegisterNetEvent("md-drugs:client:getdiethylamide", function(data) 
-    if not minigame(2, 8) then return end
+    if not minigame() then return end
 	if not progressbar(Lang.lsd.stealdie, 4000, 'uncuff') then return end
     TriggerServerEvent('md-drugs:server:getdiethylamide', data.data)
 end)
 
-RegisterNetEvent("md-drugs:client:setlsdlabkit")
-AddEventHandler("md-drugs:client:setlsdlabkit", function()
+RegisterNetEvent("md-drugs:client:setlsdlabkit", function()
 if tableout then 
     Notify(Lang.lsd.tableout, 'error')
     TriggerServerEvent('md-drugs:server:getlabkitback')
 else
     tableout = true
-    local PedCoords = GetEntityCoords(PlayerPedId())
+    local loc, head = StartRay()
+    if not loc then tableout = false TriggerServerEvent('md-drugs:server:getlabkitback') return end
 	if not progressbar(Lang.lsd.place, 4000, 'uncuff') then TriggerServerEvent('md-drugs:server:getlabkitback') return end
-	local labkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-    PlaceObjectOnGroundProperly(labkit)
-	
-    local options = {
-        { event = "md-drugs:client:heatliquid", icon = "fas fa-box-circle-check", label = "Heat Liquid" ,    data = labkit, },
-        { event = "md-drugs:client:refinequalityacid", icon = "fas fa-box-circle-check", label = "Refine",   data = labkit, },
-		{ event = "md-drugs:client:maketabpaper", icon = "fas fa-box-circle-check", label = "Dab Sheets",    data = labkit, },
-		{ event = "md-drugs:client:getlabkitback", icon = "fas fa-box-circle-check", label = "Pick Up",      data = labkit, canInteract = function() if tableout then return true end end},
-    }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(labkit, options)
-    else
-	    exports['qb-target']:AddTargetEntity(labkit, {options = options})
-    end    
+	createLabKit(loc, head)
 end
 end)
 
@@ -75,26 +58,21 @@ RegisterNetEvent("md-drugs:client:getlabkitback", function(data)
 end)
 
 RegisterNetEvent("md-drugs:client:heatliquid", function(data) 
-	local PedCoords = GetEntityCoords(PlayerPedId())
-	dict = "scr_ie_svm_technical2"
+	local PedCoords, head = GetEntityCoords(data.data), GetEntityHeading(data.data)
+	local dict = "scr_ie_svm_technical2"
     if not ItemCheck('lysergic_acid') then return end
     if not ItemCheck('diethylamide') then return end
-	if not minigame(2, 8) then
+	if not minigame() then
         TriggerServerEvent("md-drugs:server:failheating")
 		DeleteObject(data.data)
-		local dirtylabkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
+		local dirtylabkit = CreateObject("v_ret_ml_tablea", PedCoords.x, PedCoords.y, PedCoords.z-1, true, false)
+        SetEntityHeading(dirtylabkit, head)
 		loadParticle(dict)
 	    exitPtfx = StartParticleFxLoopedOnEntity("scr_dst_cocaine", dirtylabkit, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
 		PlaceObjectOnGroundProperly(dirtylabkit)
         SetParticleFxLoopedAlpha(exitPtfx, 3.0)
-		local options = {
-            { event = "md-drugs:client:cleanlabkit", icon = "fas fa-box-circle-check", label = "Clean It", data = dirtylabkit },
-        }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(dirtylabkit, options)
-        else    
-	        exports['qb-target']:AddTargetEntity(dirtylabkit, { options = options})
-        end
+        Wait(100)
+        AddMultiModel(dirtylabkit, {   event = "md-drugs:client:cleanlabkit",   icon = "fa-solid fa-hand-sparkles",   label = Lang.targets.lsd.clean, data = dirtylabkit}, nil )
         return end
     if not progressbar(Lang.lsd.heat, 7000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:heatliquid")
@@ -103,27 +81,24 @@ end)
 RegisterNetEvent("md-drugs:client:cleanlabkit", function(data)
     if not ItemCheck('cleaningkit')  then return end
     if not progressbar(Lang.lsd.clean, 4000, 'clean') then return end
-    tableout = false
-	TriggerServerEvent("md-drugs:server:removecleaningkit", data.data)
+    local check = lib.callback.await('md-drugs:server:removecleaningkit')
+    if check then 
+        local coord, head = GetEntityCoords(data.data), GetEntityHeading(data.data)
+        DeleteObject(data.data)
+        createLabKit(coord, head)
+	end
 end)
 
-
-RegisterNetEvent("md-drugs:client:resetlsdkit", function(data) 
-DeleteObject(data)
-TriggerEvent("md-drugs:client:setlsdlabkit")
-end)
-
-
 RegisterNetEvent("md-drugs:client:refinequalityacid", function()
     if not ItemCheck('lsd_one_vial')  then return end 
-    if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failrefinequality") return end
+    if not minigame() then TriggerServerEvent("md-drugs:server:failrefinequality") return end
     if not progressbar(Lang.lsd.refine, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:refinequalityacid")
 end)
 
 RegisterNetEvent("md-drugs:client:maketabpaper", function()
     if not ItemCheck('tab_paper')  then return end 
-    if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failtabs") return end
+    if not minigame() then TriggerServerEvent("md-drugs:server:failtabs") return end
 	if not progressbar(Lang.lsd.dip, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:maketabpaper")
 end)
@@ -135,7 +110,7 @@ end)
 
 
 RegisterNetEvent("md-drugs:client:buylabkit", function()
-    if QBCore.Functions.HasItem('lsdlabkit') then Notify('You Have One Idiot', 'error') return end 
+    if QBCore.Functions.HasItem('lsdlabkit') then Notify(Lang.lsd.hav, 'error') return end 
 	if not progressbar(Lang.lsd.buykit, 4000, 'uncuff') then return end
 	TriggerServerEvent("md-drugs:server:getlabkit")
 end)

client/mescaline.lua

@@ -1,13 +1,10 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 local Mescaline = {}
 
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
-end 
+local function pick(loc)
+    if not progressbar(Lang.mescaline.pick, 4000, 'uncuff') then return end    
+    TriggerServerEvent("Mescaline:pickupCane", loc)
+end
 
 RegisterNetEvent('Mescaline:respawnCane', function(loc)
     local v = GlobalState.Mescaline[loc]
@@ -15,24 +12,15 @@ RegisterNetEvent('Mescaline:respawnCane', function(loc)
     if not Mescaline[loc] then
         Mescaline[loc] = CreateObject(hash, v.location, false, true, true)
         Freeze(Mescaline[loc], true, v.heading)
-        exports['qb-target']:AddTargetEntity(Mescaline[loc], {
-        options = { 
-            {icon = "fas fa-hand",label = "pick Cactus",action = function()    if not progressbar(Lang.mescaline.pick, 4000, 'uncuff') then return end    TriggerServerEvent("Mescaline:pickupCane", loc)end}
-        },
-        distance = 2.5
-        })
+        AddSingleModel(Mescaline[loc], {icon = "fa-solid fa-seedling",label = Lang.targets.mescaline.pick, action = function()  pick(loc) end}, loc )
     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)
@@ -40,29 +28,12 @@ RegisterNetEvent("Mescaline:init", function()
         if not v.taken then
             Mescaline[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
             Freeze(Mescaline[k], true, v.heading)
-            exports['qb-target']:AddTargetEntity(Mescaline[k], {
-                options = { { icon = "fas fa-hand", label = "Pick Mescaline", action = function()  if not progressbar(Lang.mescaline.pick, 4000, 'uncuff') then return end  TriggerServerEvent("Mescaline:pickupCane", k) end}
-            },
-            distance = 2.5
-            })
+            AddSingleModel(Mescaline[k], {icon = "fa-solid fa-seedling",label = Lang.targets.mescaline.pick,action = function()  pick(k) end}, k)
         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)
+AddEventHandler('onResourceStop', function(resourceName)
     if GetCurrentResourceName() == resourceName then
         SetModelAsNoLongerNeeded(GetHashKey('prop_cactus_03'))
         for k, v in pairs(Mescaline) do
@@ -73,43 +44,28 @@ AddEventHandler('onResourceStart', function(resource)
     end
 end)
 
-
-
 RegisterNetEvent("md-drugs:client:drymescaline", function()
     if not ItemCheck('cactusbulb')  then return end 
 	if not progressbar(Lang.mescaline.dry, 4000, 'uncuff') then return end
 	TriggerServerEvent("md-drugs:server:drymescaline")
 end)
 
-
 RegisterNetEvent("md-drugs:client:takemescaline", function()
-local chance = math.random(1,100)
-local chance2 = math.random(1,100)
+    local chance, chance2 = math.random(1,100), math.random(1,100)
+    local weapon = ''
+    if chance2 == 100 then weapon = 'weapon_rpg' else weapon = 'weapon_flaregun' end
     if not progressbar(Lang.mescaline.eat, 4000, 'uncuff') then return end
 	if chance <= Config.Badtrip then 
 		AlienEffect()
-		clone = ClonePed(PlayerPedId(), false, false, true)
+		local clone = ClonePed(PlayerPedId(), false, false, true)
 		SetEntityAsMissionEntity(clone)
-		SetEntityVisible(clone, true)
-		SetPedRelationshipGroupHash(clone)
-		SetPedAccuracy(clone)
-		SetPedArmour(clone)
-		SetPedCanSwitchWeapon(clone, true)
 		SetPedFleeAttributes(clone, false)
-		if chance2 <= 99 then
-			GiveWeaponToPed(clone, "weapon_flaregun", 1, false, true)
-			TaskCombatPed(clone, PlayerPedId(), 0, 16)
-			SetPedCombatAttributes(clone, 46, true)
-			Wait(1000 * 30)
-			DeleteEntity(clone)
-		else
-			GiveWeaponToPed(clone, "weapon_rpg", 1, false, true)
-			TaskCombatPed(clone, PlayerPedId(), 0, 16)
-			SetPedCombatAttributes(clone, 46, true)
-			Wait(1000 * 30)
-			DeleteEntity(clone)
-		end
+		GiveWeaponToPed(clone, weapon, 1, false, true)
+		TaskCombatPed(clone, PlayerPedId(), 0, 16)
+		SetPedCombatAttributes(clone, 46, true)
+		Wait(1000 * 30)
+        DeleteEntity(clone)
 	else
 		AlienEffect()
-	end	
+	end
 end)

client/meth.lua

@@ -3,8 +3,10 @@ local amonia = nil
 local tray = nil
 local heated = nil
 local active = nil
-
 local function startcook()
+	if not ItemCheck('empty_weed_bag') then return end
+	if not ItemCheck('acetone') then return end
+	if not ItemCheck('ephedrine') then return end
 	if amonia == nil then
 		active = true
 		TriggerServerEvent("md-drugs:server:startcook")
@@ -17,7 +19,7 @@ end
 
 local function dials()
 	if amonia == true then
-		if not minigame(2, 8) then
+		if not minigame() then
 			AddExplosion(1005.773, -3200.402, -38.524, 49, 10, true, false, true, true)
 			ClearPedTasks(PlayerPedId())
 			amonia = nil
@@ -35,49 +37,20 @@ if tray then
 	tray = false
 	DeleteObject(trays)
 	local bucket = CreateObject(`bkr_prop_meth_bigbag_03a`, vector3(1012.85, -3194.29, -39.2), true, true, true)
-	SetEntityHeading(bucket, 90.0)
+	Freeze(bucket, true, 90.0)
 	SmashMeth()
-
-	local options = {
-		{
-			name = 'bucket',
-			icon = 'fa-solid fa-car',
-			label = 'Bag Meth',
-			action = function()
-				DeleteObject(bucket)
-				amonia = nil
-				heated = nil
-				tray = nil
-				active = nil
-				BagMeth()
-				TriggerServerEvent('md-drugs:server:getmeth')
-				
-			end,
-
-		}
-	}
-	local optionsox = {
-		{
-			name = 'bucket',
-			icon = 'fa-solid fa-car',
-			label = 'Bag Meth',
-			onSelect = function()
-				DeleteObject(bucket)
-				amonia = nil
-				heated = nil
-				tray = nil
-				active = nil
-				BagMeth()
-				TriggerServerEvent('md-drugs:server:getmeth')
-			end,
-
-		}
-	}
-	if Config.oxtarget then
-        exports.ox_target:addLocalEntity(bucket,  optionsox)
-    else 
-	    exports['qb-target']:AddTargetEntity(bucket, {options = options, distance = 2.0})
-    end   
+	Wait(100)
+	AddSingleModel(bucket, 
+	{name = 'bucket',icon = "fa-solid fa-sack-xmark",label = Lang.targets.meth.bag, canInteract = function() if active == nil then return false end end,
+	action = function() 
+		active = nil
+		DeleteObject(bucket)
+		amonia = nil
+		heated = nil
+		tray = nil
+		BagMeth()
+		TriggerServerEvent('md-drugs:server:getmeth')
+	end,}, bucket) 
 end	
 end
 
@@ -109,109 +82,57 @@ CreateThread(function()
 end)
 
 CreateThread(function()
-	exports['qb-target']:AddBoxZone("methteleout", Config.MethTeleIn, 1.5, 1.75, { name = "methteleout", heading = 11.0, debugPoly = false, minZ = Config.MethTeleIn.z - 2, maxZ = Config.MethTeleIn.z + 2,}, {
-		options = {
-			{name = 'teleout',	icon = "fas fa-sign-in-alt",	label = "Enter Building",	action = function()		SetEntityCoords(PlayerPedId(), Config.MethTeleOut)	end},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("methtelein", Config.MethTeleOut, 1.5, 1.75, {name = "methtelein",heading = 11.0,debugPoly = false,minZ = Config.MethTeleOut.z - 2,maxZ = Config.MethTeleOut.z + 2,}, {
-		options = {
-			{ name = 'teleout', icon = "fas fa-sign-in-alt", label = "Exit Building", action = function() 	SetEntityCoords(PlayerPedId(), Config.MethTeleIn) end },
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("maze", vector3(-95.55, -806.73, 44.04), 1.5, 1.75, { name = "maze", heading = 11.0, debugPoly = false, minZ = 44 - 2, maxZ = 44 + 2, }, {
-		options = {
-			{	name = 'die',	icon = "fas fa-sign-in-alt",	label = "dont click this",	action = function()		SetEntityCoords(PlayerPedId(), vector3(-75.36, -837.24, 318.93))	end},
-		},
-		distance = 2.5
-	})
-	local itemreqcook = { "ephedrine", "acetone" }
-	exports['qb-target']:AddBoxZone("ingridientsmeth", vector3(1005.7, -3201.28, -39.55), 1.5, 1.75,{ name = "ingridientsmeth", heading = 11.0, debugPoly = false, minZ = -39 - 2, maxZ = -39 + 2,}, {
-		options = {
-			{ name = 'methcook', icon = "fas fa-sign-in-alt", label = "Cook Meth", item = itemreqcook, action = function() 	startcook() end,
+	AddBoxZoneSingle("methTeleOut",Config.MethTeleIn, {name = 'teleout', icon = "fa-solid fa-door-open",   label = Lang.targets.meth.enter,	action = function()		SetEntityCoords(PlayerPedId(), Config.MethTeleOut)	end} )
+	AddBoxZoneSingle("methtelein",Config.MethTeleOut, {name = 'teleout', icon = "fa-solid fa-door-closed", label = Lang.targets.meth.exit,	action = function()		SetEntityCoords(PlayerPedId(), Config.MethTeleIn)	end} )
+	local options = {
+		{ name = 'methcook', icon = "fa-solid fa-temperature-high", label = Lang.targets.meth.cook, distance = 2.5, action = function() 	startcook() end,
 				canInteract = function()
-					if amonia == nil and active == nil then
-						return true
-					end
-			  end,
-			},
-			{ name = 'grabtray', icon = "fas fa-sign-in-alt", label = "Grab Tray", distance = 5, action = function() 	trayscarry() end,
-			  canInteract = function()
-					if heated and amonia and tray == nil then return true end
-			  end,
-			},
+				if amonia == nil and active == nil then
+					return true
+				end
+		  end,
 		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("boxmeth", vector3(1012.15, -3194.04, -39.20), 1.5, 1.75,{	name = "boxmeth",	heading = 3.0,	debugPoly = false,	minZ = -39 - 2,	maxZ = -39 + 2,}, {
-		options = {
-			{name = 'boxmeth',icon = "fas fa-sign-in-alt",label = "Box Up Meth",distance = 5,action = function()	smash()end,
-				canInteract = function()
-					if tray then return true end
-				end,
-			},
+		{ name = 'grabtray', icon = "fas fa-sign-in-alt", label = Lang.targets.meth.tray, distance = 2.5, action = function() trayscarry() end,
+		  canInteract = function()
+				if heated and amonia and tray == nil then return true end
+		  end,
 		},
-	})
-	exports['qb-target']:AddBoxZone("adjustdials", vector3(1007.89, -3201.17, -38.99), 1.5, 1.75,{	name = "adjustdials",	heading = 11.0,	debugPoly = false,	minZ = -39 - 2,	maxZ = -39 + 2,}, {
-		options = {
-			{	name = 'adjustdials',	icon = "fas fa-sign-in-alt",	label = "Adjust Dials",	distance = 5,	action = function()		dials()	end,
-				canInteract = function()
-					if amonia and heated == nil then return true end end
-			},
-		},
-	})
+	}
+	AddBoxZoneMultiOptions("cookmeth",vector3(1005.72, -3200.33, -38.52), options )
+	AddBoxZoneSingle('boxmeth', vector3(1012.15, -3194.04, -39.20), {name = 'boxmeth',icon = "fas fa-sign-in-alt",label = Lang.targets.meth.box,action = function()	smash()end,
+			canInteract = function()
+				if tray then return true end
+			end})
+	AddBoxZoneSingle('adjustdials',vector3(1007.89, -3201.17, -38.99),{	name = 'adjustdials',	icon = "fas fa-sign-in-alt",	label = Lang.targets.meth.adjust,	
+		distance = 5,	action = function() dials()	end,
+			canInteract = function()
+				if amonia and heated == nil then return true end end
+			})
 	if Config.MethHeist == false then
-		for k, v in pairs (Config.MethEph) do 
-			if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-			exports['qb-target']:AddBoxZone("methep"..k, v.loc, v.l, v.w, { name = "methep"..k, heading = v.rot, minZ = v.loc.z - 1.0, maxZ = v.loc.z + 2.0,}, {
-				options = {
-					{icon = "fas fa-sign-in-alt",	label = "Steal Ephedrine", event = 'md-drugs:client:stealeph', data = k,
-					canInteract = function()
-						if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-				},
-				},
-				distance = 2.5
-			})
-		end
-		for k, v in pairs (Config.Methace) do 
-			if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-			exports['qb-target']:AddBoxZone("methace"..k, v.loc, v.l, v.w, { name = "methace"..k, heading = v.rot, minZ = v.loc.z - 1.0, maxZ = v.loc.z + 2.0,}, {
-				options = {
-					{icon = "fas fa-sign-in-alt",	label = "Steal Acetone", event = 'md-drugs:client:stealace', data = k,
-					canInteract = function()
-						if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-				},
-				},
-				distance = 2.5
-			})
-		end
+		AddBoxZoneMulti('methep', Config.MethEph, {icon = "fas fa-sign-in-alt",	    label = Lang.targets.meth.eph, event = 'md-drugs:client:stealeph'})
+		AddBoxZoneMulti('methace', Config.Methace, {icon = "fas fa-sign-in-alt",	label = Lang.targets.meth.ace, event = 'md-drugs:client:stealace'})
 	end
 end)
 
 CreateThread(function()
-if Config.MethHeist == false then
-else
+if not Config.MethHeist == false then
 	local current = "g_m_y_famdnf_01"
 	lib.requestModel(current, Config.RequestModelTime)
 	local CurrentLocation = Config.MethHeistStart
 	local methdealer = CreatePed(0, current, CurrentLocation.x, CurrentLocation.y, CurrentLocation.z - 1, false, false)
 	Freeze(methdealer, true, 220.0)
-	exports['qb-target']:AddTargetEntity(methdealer, {
-		options = {
-			{
-				label = "Get Mission",
-				icon = "fas fa-eye",
-				action = function()
-					Notify(Lang.meth.mission, "success")
-					SpawnMethCarPedChase()
-				end,
-			},
-		}
-	})
+	Wait(100)
+	AddSingleModel(methdealer,{
+		label = Lang.targets.meth.mission,
+		icon = "fas fa-eye",
+		action = function()
+			Notify(Lang.meth.mission, "success")
+			SpawnMethCarPedChase()
+		end,
+	},nil )
 end
 end)
+
 RegisterNetEvent("md-drugs:client:stealeph", function(data)
 	if not progressbar('Stealing Ephedrine', 4000, 'uncuff') then return end
 	TriggerServerEvent("md-drugs:server:geteph", data.data)

client/oxyruns.lua

@@ -1,74 +1,46 @@
 local QBCore = exports['qb-core']:GetCoreObject()
-local deliveryBlip = nil
 local carryPackage = nil
 
-
-RegisterNetEvent("md-drugs:client:getoxytruck", function() 
-if TriggerServerEvent('md-drugs:server:payfortruck') then
-end
-end)
-
-
-RegisterNetEvent("md-drugs:Client:getoxylocation", function()
-	local coords = Config.truckspawn
-	local ModelHash = "burrito3" -- Use Compile-time hashes to get the hash of this model
-	lib.requestModel(ModelHash, Config.RequestModelTime)
-	local oxycar = CreateVehicle(ModelHash,Config.truckspawn.x, Config.truckspawn.y,Config.truckspawn.z, Config.truckspawn.h, true, false)
-    SetEntityHeading(oxycar, coords.w)
+RegisterNetEvent("md-drugs:client:GetOxyCar", function()
+	lib.requestModel("burrito3", Config.RequestModelTime)
+	local paid = lib.callback.await('md-drugs:server:payfortruck', false)
+	if not paid then return end
+	local oxycar = CreateVehicle("burrito3",Config.truckspawn.x, Config.truckspawn.y,Config.truckspawn.z, Config.truckspawn.w, true, false)
     exports[Config.Fuel]:SetFuel(oxycar, 100.0)
     TriggerEvent("vehiclekeys:client:SetOwner", QBCore.Functions.GetPlate(oxycar))
 	Notify(Lang.oxy.truck, 'success')
 	TriggerEvent("md-drugs:client:getoxylocationroute")
-    SetVehicleEngineOn(oxycar, true, true)
-    local options = {
-        { event = "md-drugs:client:getfromtrunk", icon = "fas fa-box-circle-check", label = "Get Package"},
-    }
-	if Config.oxtarget then
-		exports.ox_target:addLocalEntity(oxycar, options)
-	else 
-		exports['qb-target']:AddTargetEntity(oxycar, {options = options, distance = 2.0})
-	end  
-	
+	AddSingleModel(oxycar,  { event = "md-drugs:client:getfromtrunk", icon = "fas fa-box-circle-check", label = Lang.targets.oxy.pack}, nil )
 end)
 
 
 
 RegisterNetEvent("md-drugs:client:getoxylocationroute", function() 
-	Wait(100)
-	local unlucky = math.random(1,100)
     local CurrentLocation = Config.oxylocations[math.random(#Config.oxylocations)]
-	local unluck =  math.random(1,100)
-    if deliveryBlip ~= nil then
-        RemoveBlip(deliveryBlip)
-    end
 	if CurrentLocation ~= nil then
-    	deliveryBlip = AddBlipForCoord(CurrentLocation)
-    	SetBlipSprite(deliveryBlip, 1)
-    	SetBlipDisplay(deliveryBlip, 2)
-    	SetBlipScale(deliveryBlip, 1.0)
-    	SetBlipAsShortRange(deliveryBlip, false)
-    	SetBlipColour(deliveryBlip, 27)
-    	BeginTextCommandSetBlipName("STRING")
-    	AddTextComponentSubstringPlayerName("drug Meet")
-    	EndTextCommandSetBlipName(deliveryBlip)
-    	SetBlipRoute(deliveryBlip, true)
-	local current = "g_m_y_famdnf_01"
-	lib.requestModel(current, Config.RequestModelTime)
+    	SetNewWaypoint(CurrentLocation.x, CurrentLocation.y)
+		local current = "g_m_y_famdnf_01"
+		lib.requestModel(current, Config.RequestModelTime)
     	local oxybuyer = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false)
-	Freeze(oxybuyer, true, CurrentLocation.w)
-	repeat
-		Wait(1000)
-	until #(GetEntityCoords(PlayerPedId()) - vector3(CurrentLocation.x,CurrentLocation.y,CurrentLocation.z)) < 5.0
-		RemoveBlip(deliveryBlip)
+		Freeze(oxybuyer, true, CurrentLocation.w)
+		repeat
+			Wait(1000)
+		until #(GetEntityCoords(PlayerPedId()) - vector3(CurrentLocation.x,CurrentLocation.y,CurrentLocation.z)) < 5.0
+		
 		PoliceCall(Config.PoliceAlertOxy)
-		local options = {
-    	        { type = "client", label = "Talk To Buyer", icon = "fas fa-eye", event = "md-drugs:client:giveoxybox", ped = oxybuyer},
-    	    }
-		if Config.oxtarget then
-			exports.ox_target:addLocalEntity(oxybuyer, options)
-		else 
-			exports['qb-target']:AddTargetEntity(oxybuyer, {options = options, distance = 2.0})
-		end   
+		AddSingleModel(oxybuyer,  { type = "client", label = Lang.targets.oxy.talk, icon = "fas fa-eye", 
+		action = function()
+			if carryPackage then
+				if not progressbar(Lang.oxy.hand, 4000, 'uncuff') then return end
+				TriggerServerEvent("md-drugs:server:giveoxybox")
+				DeleteEntity(oxybuyer)
+				DetachEntity(carryPackage, true, true)
+				DeleteObject(carryPackage)
+				carryPackage = nil
+			else
+				Notify(Lang.oxy.empty, "error")
+			end
+		end}, oxybuyer)
 	end
 end)
 

client/pharma.lua

@@ -1,15 +1,16 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
 RegisterNetEvent("md-drugs:client:prescriptionpad", function(args)
+local icon, event = 'fa-solid fa-file-prescription', 'md-drugs:client:writeprescription'
 if QBCore.Functions.GetPlayerData().job.type == Config.PharmaJob then 
    lib.registerContext({
    id = 'prescriptionpad',
    title = "Prescription Pad",
    options = {
-        {title  = 'Give Vics', description  = 'Give Vics ', icon = 'fa-solid fa-file-prescription', event = 'md-drugs:client:writeprescription',  args = {item = 'vicodin_prescription'}},  
-        {title  = 'Give Madderal', description  = 'Give Madderal ', icon = 'fa-solid fa-file-prescription', event = 'md-drugs:client:writeprescription',  args = {item = 'adderal_prescription'}},  
-		{title  = 'Give Morphin',description  = 'Give Morphin ',icon = 'fa-solid fa-file-prescription', event = 'md-drugs:client:writeprescription', args = {item = 'morphine_prescription'}},  
-        {title  = 'Give Zany',   description  = 'Give Zany ', icon = 'fa-solid fa-file-prescription',   event = 'md-drugs:client:writeprescription',      args = {item = 'xanax_prescription'} },
+        {title  = 'Give Vics',     description  = 'Give Vics ',     icon = icon, event = event,  args = {item = 'vicodin_prescription'}},
+        {title  = 'Give Madderal', description  = 'Give Madderal ', icon = icon, event = event,  args = {item = 'adderal_prescription'}},
+		{title  = 'Give Morphin',  description  = 'Give Morphin ',  icon = icon, event = event,  args = {item = 'morphine_prescription'}},
+        {title  = 'Give Zany',     description  = 'Give Zany ',     icon = icon, event = event,  args = {item = 'xanax_prescription'} },
 	}
     })
     lib.showContext('prescriptionpad')	
@@ -18,20 +19,16 @@ else
 end
 end)
 
-
-
 RegisterNetEvent("md-drugs:client:writeprescription", function(args)
     if not progressbar(Lang.Pharma.write, 4000, 'notepad') then return end
 	TriggerServerEvent("md-drugs:server:giveprescription", args.item)
 end)
 
-
 RegisterNetEvent("md-drugs:client:fillprescription", function(data) 
     if not progressbar(Lang.Pharma.fill, 4000, 'uncuff') then return end
 	TriggerServerEvent("md-drugs:server:fillprescription", data.data)    
 end)
 
-
 RegisterNetEvent("md-drugs:client:unbottle", function(item) 
     if not progressbar(Lang.Pharma.open, 4000, 'uncuff') then return end
     if item.name == 'vicodinbottle' then item = 'vicodin' end
@@ -40,17 +37,3 @@ RegisterNetEvent("md-drugs:client:unbottle", function(item)
     if item.name == 'xanaxbottle' then item = 'xanax' end
     TriggerServerEvent('md-drugs:server:unbottle', item)
 end)
-
-
-RegisterNetEvent('md-drugs:client:takepharma', function(itemName)
-	if not progressbar(Lang.Pharma.consume, 1000, 'eat') then return end
-	if itemName == "vicodin" then
-		exports['ps-buffs']:AddHealthBuff(10000, 20)
-	elseif itemName == "adderal" then
-		exports['ps-buffs']:StaminaBuffEffect(5000, 1.3)
-	elseif itemName == "xanax" then 
-		exports['ps-buffs']:AddStressBuff(10000, 25)
-	else 
-		exports['ps-buffs']:AddHealthBuff(10000, 40)
-	end
-end)

client/shrooms.lua

@@ -1,13 +1,16 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 local shrooms = {}
 
+local function pick(loc)
+    if not progressbar(Lang.Shrooms.pick, 4000, 'uncuff') then return end  
+    TriggerServerEvent("shrooms:pickupCane", loc)
+end
 
 function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
+	RequestModel(hash)
+	while not HasModelLoaded(hash)  do
+		Wait(0)
+	end
 end
 
 RegisterNetEvent('shrooms:respawnCane', function(loc)
@@ -16,20 +19,9 @@ RegisterNetEvent('shrooms:respawnCane', function(loc)
     if not shrooms[loc] then
         shrooms[loc] = CreateObject(hash, v.location, false, true, true)
         Freeze(shrooms[loc], true, v.heading)
-        exports['qb-target']:AddTargetEntity(shrooms[loc], {
-            options = { { icon = "fas fa-hand", label = "pick shrooms", action = function() if not progressbar(Lang.Shrooms.pick, 4000, 'uncuff') then return end  TriggerServerEvent("shrooms:pickupCane", loc) end }
-        },
-        distance = 2.5
-        })
+        AddSingleModel(shrooms[loc],{ icon = "fas fa-hand", label = Lang.targets.shrooms.pick, action = function() pick(loc) end }, loc )
     end
 end)
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-		Wait(3000)
-        LoadModel('mushroom')
-        TriggerEvent('shrooms:init')
-    end
- end)
 
 AddEventHandler('onResourceStop', function(resourceName)
     if GetCurrentResourceName() == resourceName then
@@ -47,30 +39,18 @@ RegisterNetEvent('shrooms:removeCane', function(loc)
     shrooms[loc] = nil
 end)
 
- RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
-     Wait(3000)
-     LoadModel('mushroom')
-     TriggerEvent('shrooms:init')
- end)
-
-
- RegisterNetEvent("shrooms:init", function()
+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
+        lib.requestModel(v.model, Config.RequestModelTime)  
         if not v.taken then
             shrooms[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
             Freeze(shrooms[k], true, v.heading)
-            exports['qb-target']:AddTargetEntity(shrooms[k], {
-                options = { { icon = "fas fa-hand", label = "Pick shrooms", action = function() if not progressbar(Lang.Shrooms.pick, 4000, 'uncuff') then return end     TriggerServerEvent("shrooms:pickupCane", k) end }
-            },
-            distance = 2.5
-            })
+            AddSingleModel(shrooms[k],{ icon = "fas fa-hand", label = Lang.targets.shrooms.pick, action = function() pick(k) end }, k )
         end
     end
 end)
 
-
 RegisterNetEvent('md-drugs:client:takeshrooms', function()
     if not progressbar(Lang.Shrooms.eat, 500, 'eat')  then return end              
     TriggerEvent("evidence:client:SetStatus", "widepupils", 300)

client/target.lua

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

client/travellingmerchant.lua

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

client/weed.lua

@@ -1,14 +1,14 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 local WeedPlant = {}
-local exploded = nil
-local drying = false
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
-end 
+local exploded, drying = false, false
+
+local function hasJob()
+	if Config.Joblock then
+		if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
+		return true else return false end
+	else
+	return true end
+ end
 
 RegisterNetEvent('weed:respawnCane', function(loc)
     local v = GlobalState.WeedPlant[loc]
@@ -16,26 +16,11 @@ RegisterNetEvent('weed:respawnCane', function(loc)
     if not HasModelLoaded(hash) then LoadModel(hash) end
     if not WeedPlant[loc] then
         WeedPlant[loc] = CreateObject(hash, v.location.x, v.location.y, v.location.z-3.5, false, true, true)
-	Freeze(WeedPlant[loc],true,  v.heading)
-         exports['qb-target']:AddTargetEntity(WeedPlant[loc], {
-            options = { 
-				{
-                    icon = "fas fa-hand",
-                    label = "Pick Weed",
-                    action = function()
-                       if not progressbar(Lang.Weed.pick, 4000, 'uncuff') then return end
-                        TriggerServerEvent("weed:pickupCane", loc)
-                    end,
-					canInteract = function()
-						if Config.Joblock then
-							if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-								return true end
-						else
-						return true end end,
-                }
-            },
-distance = 2.5
-           })
+		Freeze(WeedPlant[loc],true,  v.heading)
+        AddSingleModel(WeedPlant[loc],  
+			    {icon = "fas fa-hand",label = Lang.targets.weed.pick, 
+				action = function()if not progressbar(Lang.Weed.pick, 4000, 'uncuff') then return end	TriggerServerEvent("weed:pickupCane", loc) end},
+			loc)
     end
 end)
 
@@ -50,42 +35,15 @@ RegisterNetEvent("weed:init", function()
         if not HasModelLoaded(hash) then LoadModel(hash) end
         if not v.taken then
             WeedPlant[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z-3.5, false, true, true)
-	Freeze(WeedPlant[k],true,  v.heading)
-            exports['qb-target']:AddTargetEntity(WeedPlant[k], {
-                options = { 
-					{
-                        icon = "fas fa-hand",
-                        label = "Pick Weed",
-                        action = function()
-							if not progressbar(Lang.Weed.pick, 4000, 'uncuff') then return end
-							TriggerServerEvent("weed:pickupCane", k)
-                        end,
-						canInteract = function()
-						if Config.Joblock then
-							if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-								return true end
-						else
-						return true end end,
-                    }
-                },
-                distance = 2.5
-               })
+			Freeze(WeedPlant[k],true,  v.heading)
+			AddSingleModel(WeedPlant[k],  
+			    {icon = "fas fa-hand",label = Lang.targets.weed.pick, 
+				action = function()if not progressbar(Lang.Weed.pick, 4000, 'uncuff') then return end	TriggerServerEvent("weed:pickupCane", k) end},
+			k)
         end
     end
 end)
 
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('bkr_prop_weed_lrg_01b')
-        TriggerEvent('weed:init')
-    end
- end)
- RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
-     Wait(3000)
-     LoadModel('bkr_prop_weed_lrg_01b')
-     TriggerEvent('weed:init')
- end)
- 
 AddEventHandler('onResourceStop', function(resourceName)
     if GetCurrentResourceName() == resourceName then
         SetModelAsNoLongerNeeded(GetHashKey('bkr_prop_weed_lrg_01b'))
@@ -98,234 +56,74 @@ AddEventHandler('onResourceStop', function(resourceName)
 end)
 
 CreateThread(function()
+	AddBoxZoneMulti('weeddry', Config.WeedDry, {
+		name = 'dryweed',
+		icon = "fas fa-sign-in-alt",
+		label = Lang.targets.weed.dry,
+		distance = 1,
+		action = function()
+			if not ItemCheck('wetcannabis') then return end
+			if drying then
+				Notify(Lang.Weed.busy, "error")
+			else
+				local loc = GetEntityCoords(PlayerPedId())
+				local weedplant = CreateObject("bkr_prop_weed_drying_01a", loc.x, loc.y+.2, loc.z, true, false)
+				drying = true
+				FreezeEntityPosition(weedplant, true)
+				Notify(Lang.Weed.wait, "success")
+				Wait(math.random(1000,5000))
+				Notify(Lang.Weed.take, "success")
+				AddSingleModel(weedplant, {
+					icon = "fas fa-sign-in-alt",
+					label = Lang.targets.weed.dpick,
+					action = function()
+						DeleteEntity(weedplant)
+						drying = false
+						TriggerServerEvent('md-drugs:server:dryoutweed')
+					end,
+					canInteract = function()
+						if hasJob() then return true end end									
+				}, nil)
+			end
+		end,
+		canInteract = function()
+			if hasJob() then return true end end	
+	})
 
+AddBoxZoneSingle('teleinweedout', Config.Teleout, { name = 'teleout', icon = "fas fa-sign-in-alt", label = Lang.targets.coke.exit, distance = 2.0, action = function() SetEntityCoords(PlayerPedId(),Config.Telein) end,
+	canInteract = function() if hasJob() then return true end end	
+}) 
+AddBoxZoneSingle('teleinweedin', Config.Telein, { name = 'teleout', icon = "fas fa-sign-in-alt", label = Lang.targets.coke.enter, distance = 2.0, action = function() SetEntityCoords(PlayerPedId(),Config.Teleout) end,
+	canInteract = function() if hasJob() then return true end end	
+}) 
+AddBoxZoneSingle('MakeButterCrafting', Config.MakeButter, {label = Lang.targets.weed.butt, action = function() lib.showContext('ButterCraft') end, icon = "fas fa-sign-in-alt", 
+canInteract = function() if hasJob() then return true end end	
+}) 
 
-for k, v in pairs (Config.WeedDry) do
-
-exports['qb-target']:AddBoxZone("weeddry"..k,v,1.5, 1.75, {name = "weeddry"..k,heading = 11.0,debugPoly = false,minZ = v.z-2,maxZ = v.z+2,}, {
-	options = {
-		{
-			name = 'dryweed',
-			icon = "fas fa-sign-in-alt",
-			label = "Dry Weed",
-			distance = 1,
-			item = "wetcannabis",
-			action = function()
-				if drying then
-					Notify(Lang.Weed.busy, "error")
-				else
-					local loc = GetEntityCoords(PlayerPedId())
-					local weedplant = CreateObject("bkr_prop_weed_drying_01a", loc.x, loc.y+.2, loc.z, true, false)
-					drying = true
-					FreezeEntityPosition(weedplant, true)
-					Notify("Wait A little Bit To Dry", "success")
-					Wait(math.random(1000,5000))
-					Notify("Take Down The Weed", "success")
-					local options = {
-						{
-							icon = "fas fa-sign-in-alt",
-							label = "Pick Up Weed",
-							action = function()
-								DeleteEntity(weedplant)
-								drying = false
-								TriggerServerEvent('md-drugs:server:dryoutweed')
-							end,
-							canInteract = function()
-								if Config.Joblock then
-									if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-										return true end
-								else
-								return true end end,										
-						}
-					}
-					local optionsox = {
-						{
-							icon = "fas fa-sign-in-alt",
-							label = "Pick Up Weed",
-							onSelect = function()
-								DeleteEntity(weedplant)
-								drying = false
-								TriggerServerEvent('md-drugs:server:dryoutweed')
-							end,
-							canInteract = function()
-								if Config.Joblock then
-									if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-										return true end
-								else
-								return true end end,										
-						}
-					}
-					if Config.oxtarget then
-						exports.ox_target:addLocalEntity(weedplant, optionsox )
-					else
-						exports['qb-target']:AddTargetEntity(weedplant, {options = options})
-					end
-				end
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					if drying == false then 
-					return true end end
-			else
-			return true end end,
-		},
-	},
-})
-end
-exports['qb-target']:AddBoxZone("teleinweed",Config.Telein,1.5, 1.75, {name = "teleinweed",heading = 11.0,debugPoly = false,minZ = Config.Telein.z-2,maxZ = Config.Telein.z+2,}, {
-	options = {
-		{ name = 'teleout', icon = "fas fa-sign-in-alt", label = "Enter Building", distance = 2.0,
-			action = function()
-				SetEntityCoords(PlayerPedId(),Config.Teleout)
-				
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-	},	
-})
-exports['qb-target']:AddBoxZone("teleinweedout",Config.Teleout,1.5, 1.75, { name = "teleinweedout",heading = 11.0,debugPoly = false,minZ = Config.Teleout.z-2,maxZ = Config.Teleout.z+2,}, {
-options = {
-		{ name = 'teleout', icon = "fas fa-sign-in-alt", label = "Exit Building", distance = 2.0,
-			action = function()
-				SetEntityCoords(PlayerPedId(),Config.Telein)
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-	},	
-})
-exports['qb-target']:AddBoxZone("MakeButter",Config.MakeButter,1.5, 1.75, {name = "MakeButter",heading = 11.0,debugPoly = false,minZ = Config.MakeButter.z-2,maxZ = Config.MakeButter.z+2,}, {
-options = {
-		{
-			name = 'butter',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Butter",
-			action = function()
-				if not ItemCheck('mdbutter') and not ItemCheck('grindedweed') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.canna, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makebutter")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-		{
-			name = 'makebrownies',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Brownies",
-			item = "cannabutter",
-			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('flour') and not ItemCheck('chocolate') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.brown, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makebrownies")       
-				
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-		{
-			name = 'makecookies',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Cookies",
-			item = "cannabutter",
-			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('flour') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.cook, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makecookies")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-		{
-			name = 'makechocolate',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Chocolate",
-			item = "cannabutter",
-			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('chocolate') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.choc, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makechocolate")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-		{
-			name = 'makemuffin',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Muffin",
-			item = "cannabutter",
-			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('flour') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.muff, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makemuffin")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-	},	
-})
-exports['qb-target']:AddBoxZone("makeoil",Config.MakeOil,1.5, 1.75, {name = "makeoil",heading = 11.0,debugPoly = false,minZ = Config.MakeOil.z-2,maxZ = Config.MakeOil.z+2,}, {
-options = {
-		{
-			name = 'Oil',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Oil",
-			action = function()
-				if not ItemCheck('butane') and not ItemCheck('grindedweed') then return end
-				if not minigame(2, 8) then 
-					local explosion = math.random(1,100)
-						local loc = GetEntityCoords(PlayerPedId())
-						if explosion <= 99 then
-							AddExplosion(loc.x, loc.y, loc.z, 49, 10, true, false, true, true)
-							exploded = true
-							Notify(Lang.Weed.stovehot, "error")
-							Wait(1000 * 30)
-							exploded = nil
-						end	
-				return end
-				if not progressbar(Lang.Weed.shat, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makeoil")       			
-			end,
-			canInteract = function()
-			if exploded == nil then return true end
-			end,
-		},
-	},	
-})
+AddBoxZoneSingle('makeoil',Config.MakeOil, {
+	name = 'Oil',
+	icon = "fas fa-sign-in-alt",
+	label = Lang.targets.weed.oil,
+	action = function()
+		if not ItemCheckMulti({'butane', 'grindedweed'}) then return end
+		if not minigame() then 
+			local explosion = math.random(1,100)
+			local loc = GetEntityCoords(PlayerPedId())
+			if explosion <= 99 then
+				AddExplosion(loc.x, loc.y, loc.z, 49, 10, true, false, true, true)
+				exploded = true
+				Notify(Lang.Weed.stovehot, "error")
+				Wait(1000 * 30)
+				exploded = false
+			end	
+		return end
+		if not progressbar(Lang.Weed.shat, 4000, 'uncuff') then return end
+		TriggerServerEvent("md-drugs:server:makeoil")       			
+	end,
+	canInteract = function()
+	if hasJob() and exploded == false then return true end
+	end,
+} )
 end)
 
 CreateThread(function()
@@ -334,47 +132,26 @@ CreateThread(function()
     BikerWeedFarm.Security.Set(BikerWeedFarm.Security.upgrade)
     BikerWeedFarm.Details.Enable(BikerWeedFarm.Details.chairs, true)
     BikerWeedFarm.Details.Enable({BikerWeedFarm.Details.production, BikerWeedFarm.Details.chairs, BikerWeedFarm.Details.drying}, true)
-	BikerWeedFarm.Plant1.Clear(false)
-    BikerWeedFarm.Plant2.Clear(false)
-    BikerWeedFarm.Plant3.Clear(false)
-    BikerWeedFarm.Plant4.Clear(false)
-    BikerWeedFarm.Plant5.Clear(false)
-    BikerWeedFarm.Plant6.Clear(false)
-    BikerWeedFarm.Plant7.Clear(false)
-    BikerWeedFarm.Plant8.Clear(false)
-    BikerWeedFarm.Plant9.Clear(false)
+	BikerWeedFarm.Plant1.Clear(false) BikerWeedFarm.Plant2.Clear(false) BikerWeedFarm.Plant3.Clear(false)
+	BikerWeedFarm.Plant4.Clear(false) BikerWeedFarm.Plant5.Clear(false) BikerWeedFarm.Plant6.Clear(false)
+	BikerWeedFarm.Plant7.Clear(false) BikerWeedFarm.Plant8.Clear(false) BikerWeedFarm.Plant9.Clear(false)
     RefreshInterior(BikerWeedFarm.interiorId)
-	stove = CreateObject("prop_cooker_03",vector3(1045.49, -3198.46, -38.15-1), true, false)
+	local stove = CreateObject("prop_cooker_03",vector3(1045.49, -3198.46, -38.15-1), true, false)
 	SetEntityHeading(stove, 270.00)
 	FreezeEntityPosition(stove, true)
-	stove2 = CreateObject("prop_cooker_03",vector3(1038.90, -3198.66, -38.17-1), true, false)
+	local stove2 = CreateObject("prop_cooker_03",vector3(1038.90, -3198.66, -38.17-1), true, false)
 	SetEntityHeading(stove2, 90.00)
 	FreezeEntityPosition(stove2, true)
 end)
 
-RegisterNetEvent('md-drugs:client:bluntwraps', function(args)
-  lib.registerContext({
-    id = 'bluntroll',
-    title = 'Blunt Types',
-    menu = 'bluntroll',
-    options = {
-    	{ title = 'Roll Blunt',  description = 'Roll A Regular Blunt',  icon = 'check',  serverEvent = 'md-drugs:server:rollblunt'},
-		{ title = 'Dip Blunt Wrap In Lean', description = 'Roll A Lean Blunt', icon = 'check', serverEvent = 'md-drugs:server:rollleanblunt'},
-		{ title = 'Dip Blunt Wrap In Dextro',  description = 'Roll A Dextro Blunt',  icon = 'check',  serverEvent = 'md-drugs:server:rolldextroblunt'},
-		{ title = 'Roll A Chewy Blunt',  description = 'Roll A Chewy Blunt',  icon = 'check',  serverEvent = 'md-drugs:server:rollchewyblunt'},
-  	},
-  })
-  lib.showContext('bluntroll')
-end)
 
 RegisterNetEvent("md-drugs:client:rollanim", function()
 if not progressbar(Lang.Weed.roll, 4000, 'uncuff') then return end
 end)
+
 RegisterNetEvent("md-drugs:client:grind", function()
 	if not progressbar("grinding", 4000, 'uncuff') then return end
 end)
-	
-
 
 RegisterNetEvent("md-drugs:client:dodabs", function()
 if not progressbar('Doing Dabs', 4000, 'bong2') then return end
@@ -382,32 +159,60 @@ AlienEffect()
 end)
 
 CreateThread(function()
-local WeedShop = {}
-local current = "u_m_m_jesus_01"
-
+	local current = "u_m_m_jesus_01"
 	lib.requestModel(current, Config.RequestModelTime)
 	local CurrentLocation = Config.WeedSaleman
 	local WeedGuy = CreatePed(0,current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false)
 	Freeze(WeedGuy, true, CurrentLocation.w)
-	exports['qb-target']:AddTargetEntity(WeedGuy, { 
-        options = {
-            {label = "Weed Shop",icon = "fas fa-eye",action = function() lib.showContext('WeedShop')end},
-        }
-		})
-for k, v in pairs (Config.Weed.items) do 
-	WeedShop[#WeedShop + 1] = {
-		icon =  GetImage(v.name),
-		 title = GetLabel(v.name),
-		 description = '$'.. v.price,
-		 event = "md-drugs:client:travellingmerchantox",
-		 args = {
-			item = v.name,
-			cost = v.price,
-		   	amount = v.amount,
-		   	table = Config.Weed.items,
-		  	 num = k,
-		 }
-	 }
- lib.registerContext({id = 'WeedShop',title = "Weed Shop", options = WeedShop})
-	end
+	AddSingleModel(WeedGuy, {label = "Weed Shop",icon = "fas fa-eye", action = function() makeMenu('WeedShop') lib.showContext('WeedShop')end}, nil)
+end)
+
+local function createBluntOptions(contextId, contextTitle, eventLabelPrefix, tableName)
+    local options = {}
+	local items = lib.callback.await('md-drugs:server:GetRecipe', false,'weed',tableName)
+    for k, v in pairs(items) do
+        local label = {}
+        local item = ''
+        for m, d in pairs(v.take) do table.insert(label, GetLabel(m) .. ' X ' .. d) end 
+		for m, d in pairs(v.give) do item = m end
+        options[#options + 1] = {
+            icon = GetImage(item),
+            description = table.concat(label, ", "),
+            title = GetLabel(item),
+            event = "md-drugs:client:MakeWeedItems",
+            args = {
+                item = item, 
+                recipe = 'weed',
+                num = k,
+                label = eventLabelPrefix .. GetLabel(item),
+                table = tableName
+            }
+        }
+    end
+    sorter(options, 'title')
+    lib.registerContext({
+        id = contextId,
+        title = contextTitle,
+        options = options
+    })
+end
+
+CreateThread(function()
+createBluntOptions('ButterCraft', "Edible Cooking", 'Cooking A ', 'edibles')
+createBluntOptions('mddrugsblunts', "Roll Blunts", 'Rolling A ', 'blunts')
+createBluntOptions('mddrugsbluntwraps', "Dipping Syrup", 'Dipping Syrup To Make ', 'bluntwrap')
+end)
+
+RegisterNetEvent("md-drugs:client:MakeWeedItems", function(data)
+	if not minigame() then return end
+	if not progressbar('Making ' .. data.item, 4000, 'uncuff') then return end
+	TriggerServerEvent('md-drugs:server:MakeWeedItems', data)
+end)
+
+RegisterNetEvent('md-drugs:client:makeBluntWrap', function(data)
+	lib.showContext('mddrugsbluntwraps')
+end)
+
+RegisterNetEvent('md-drugs:client:rollBlunt', function(data)
+	lib.showContext('mddrugsblunts')
 end)

client/wholesale.lua

@@ -1,28 +1,39 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 local miss = false
-local deliveryBlip = nil
+
 
 RegisterNetEvent("md-drugs:client:GetLocation", function(drug, notify)
     if not GetCops(Config.PoliceCount) then return end
  if miss then
-    Notify('Already Called Someone', 'error')
+    Notify(Lang.Wholesale.al, 'error')
  else   
     TriggerServerEvent('md-drugs:server:RemoveBurner', drug)
     Notify(notify, 'success')
-	local unlucky = math.random(1,100)
     local CurrentLocation = Config.oxylocations[math.random(#Config.oxylocations)]
     local timer = 0
     miss = true
-    deliveryBlip = AddBlipForCoord(CurrentLocation)
-    SetBlipSprite(deliveryBlip, 1)
-    SetBlipDisplay(deliveryBlip, 2)
-    SetBlipScale(deliveryBlip, 1.0)
-    SetBlipAsShortRange(deliveryBlip, false)
-    SetBlipColour(deliveryBlip, 27)
-    BeginTextCommandSetBlipName("STRING")
-    AddTextComponentSubstringPlayerName("drug Meet")
-    EndTextCommandSetBlipName(deliveryBlip)
-    SetBlipRoute(deliveryBlip, true)
+    SetNewWaypoint(CurrentLocation.x, CurrentLocation.y)
+    lib.requestModel("g_m_y_famdnf_01", Config.RequestModelTime)
+	    local current = "g_m_y_famdnf_01"
+       local drugdealer = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, 90.0, false, false)
+       FreezeEntityPosition(drugdealer, true)
+       SetEntityInvincible(drugdealer, true)
+       AddSingleModel(drugdealer, {
+           type = "client",
+           label = Lang.Wholesale.talk,
+           icon = "fas fa-eye",
+           action = function()
+                local luck = math.random(1,100)
+                if luck >= Config.SuccessfulChance then
+                    TriggerEvent("md-drugs:client:SuccessSale", drug)
+                else
+                    TriggerEvent("md-drugs:client:SetUp")
+                end
+                Wait(3000)
+                DeleteEntity(drugdealer)
+                miss = false
+            end,	
+       },nil )
 	repeat
         Wait(1000)
         timer = timer + 1
@@ -30,62 +41,29 @@ RegisterNetEvent("md-drugs:client:GetLocation", function(drug, notify)
     PoliceCall(Config.AlertPoliceWholesale)
     if timer <= Config.WholesaleTimeout or #(GetEntityCoords(PlayerPedId()) - vector3(CurrentLocation.x, CurrentLocation.y, CurrentLocation.z) ) < 4.0  then
         timer = 0
-        RemoveBlip(deliveryBlip)
-        lib.requestModel("g_m_y_famdnf_01", Config.RequestModelTime)
-	    local current = "g_m_y_famdnf_01"
-       local drugdealer = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, 90.0, false, false)
-        FreezeEntityPosition(drugdealer, true)
-        SetEntityInvincible(drugdealer, true)
-	        exports['qb-target']:AddTargetEntity(drugdealer, {
-           options = {
-               {
-                   type = "client",
-                   label = "Talk To Buyer",
-                   icon = "fas fa-eye",
-                   action = function()
-	        				local luck = math.random(1,100)
-	        				local ped = GetEntityCoords(PlayerPedId())
-	        				if luck <= Config.SuccessfulChance then
-	        					TriggerEvent("md-drugs:client:SuccessSale", drug)
-                                Wait(4000)
-                                DeleteEntity(drugdealer)
-	        				else
-	        					TriggerEvent("md-drugs:client:SetUp")
-	        					Wait(3000)
-	        					SetUpPeds()
-                                Wait(4000)
-                                DeleteEntity(drugdealer)
-	        				end
-                            miss = false
-	        			end,	
-               },
-           },
-           distance = 2.0
-        })
     else
         Notify('The Buyer Waited To Long')
-        RemoveBlip(deliveryBlip)
+        DeleteEntity(drugdealer)
     end
 end
 end)
 
 
 RegisterNetEvent("md-drugs:client:SuccessSale", function(drug) 
-        if not progressbar("Wholesaling Drugs", 4000, 'uncuff') then return end
-        if drug == 'coke' then
-            TriggerServerEvent("md-drugs:server:wholesalecoke")
-        elseif drug == 'crack' then
-            TriggerServerEvent("md-drugs:server:wholesalecrack")
-        elseif drug == 'lsd' then 
-            TriggerServerEvent("md-drugs:server:wholesalelsd")
-        elseif drug == 'heroin' then
-            TriggerServerEvent("md-drugs:server:wholesaleheroin")
-        elseif drug == 'xtc' then
-            TriggerEvent("md-drugs:client:wholesalextc")    
-        end
+    if not progressbar("Wholesaling Drugs", 4000, 'uncuff') then return end
+    if drug == 'coke' then
+        TriggerServerEvent("md-drugs:server:wholesalecoke")
+    elseif drug == 'crack' then
+        TriggerServerEvent("md-drugs:server:wholesalecrack")
+    elseif drug == 'lsd' then 
+        TriggerServerEvent("md-drugs:server:wholesalelsd")
+    elseif drug == 'heroin' then
+        TriggerServerEvent("md-drugs:server:wholesaleheroin")
+    elseif drug == 'xtc' then
+        TriggerEvent("md-drugs:client:wholesalextc")    
+    end
 end)
 
-
 RegisterNetEvent("md-drugs:client:SetUp", function() 
     progressbar("YOU FUCKED NOW", 4000, 'uncuff') 
     SetUpPeds() 

client/xtc.lua

@@ -1,121 +1,59 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 local xtcpress = false
 
-
 RegisterNetEvent("md-drugs:client:setpress", function(type)
-    
     if xtcpress then 
         Notify(Lang.xtc.out, 'error')
     else
-        local PedCoords = GetEntityCoords(PlayerPedId())
-        xtcpress = true
+      local coords, head = StartRay2()
+      xtcpress = true
 	    progressbar('Setting Press On The Ground', 4000, 'uncuff')
-	    local press = CreateObject("bkr_prop_coke_press_01aa", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
+	    local press = CreateObject("bkr_prop_coke_press_01aa", coords.x, coords.y, coords.z, true, false, false)
 	    PlaceObjectOnGroundProperly(press)
-	
+      SetEntityHeading(press, head)
         local options = {
-            {   
-                icon = "fas fa-eye",
-                label = "Make XTC",
-                action = function() 
-                    TriggerEvent("md-drugs:client:XTCMenu", type) 
-                end,   
-                canInteract = function()
-                    if xtcpress then return true end end
+            { icon = "fas fa-eye", label = Lang.targets.xtc.make, distance = 2.0, action = function()  TriggerEvent("md-drugs:client:XTCMenu", type) end, 
+            canInteract = function() if xtcpress then return true end end
             },
-            {     
-                icon = "fas fa-eye",    
-                label = "Pick Up",   
-                action = function()  
-                    TriggerEvent("md-drugs:client:GetPressBack", type, press) 
-                end,  
-                canInteract = function()        
-                    if xtcpress then return true end end 
+            {icon = "fas fa-eye", label = Lang.targets.xtc.pick, action = function() TriggerEvent("md-drugs:client:GetPressBack", type, press) end, distance = 2.0,
+              canInteract = function() if xtcpress then return true end end
             },
         }
-        local optionsox = {
-            {   
-                icon = "fas fa-eye",
-                label = "Make XTC",
-                onSelect = function() 
-                    TriggerEvent("md-drugs:client:XTCMenu", type) 
-                end,   
-                canInteract = function()
-                    if xtcpress then return true end end
-            },
-            {     
-                icon = "fas fa-eye",    
-                label = "Pick Up",   
-                onSelect = function()  
-                    TriggerEvent("md-drugs:client:GetPressBack", type, press) 
-                end,  
-                canInteract = function()        
-                    if xtcpress then return true end end 
-            },
-        }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(press,  optionsox)
-        else
-            exports['qb-target']:AddTargetEntity(press, { options = options})
-        end
+        AddMultiModel(press, options, nil)
     end
-end)    
+end)
 
 RegisterNetEvent("md-drugs:client:XTCMenu", function(type)
+  local event =  "md-drugs:client:MakeXTC"
     lib.registerContext({
         id = 'XTCmenu',
         title = 'XTC Menu',
         options = {
-          {
-            icon = GetImage('white_xtc'),
-            title = 'White XTC',
-            description = '1 X Raw XTC',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'white'}
-          },
-          {
-            icon = GetImage('red_xtc'),
-            title = 'Red XTC',
-            description = '1 X Raw XTC and 1 X Loose Coke',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'red'}
-          },
-          {
-            icon = GetImage('orange_xtc'),
-            title = 'Orange XTC',
-            description = '1 X Raw XTC and 1 X Heroin Vial',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'orange'}
-          },
-          {
-            icon = GetImage('blue_xtc'),
-            title = 'Blue XTC',
-            description = '1 X Raw XTC and 1 X Crack Rock',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'blue'}
-          },
-          
+          {icon = GetImage('white_xtc'),   title = 'White XTC',  description = '1 X Raw XTC',  event = event,  args = { data = type, color = 'white'}},
+          {icon = GetImage('red_xtc'),     title = 'Red XTC',    description = '1 X Raw XTC and 1 X Loose Coke',  event = event,  args = { data = type, color = 'red'}},
+          {icon = GetImage('orange_xtc'),  title = 'Orange XTC', description = '1 X Raw XTC and 1 X Heroin Vial',  event = event,  args = { data = type, color = 'orange'}},
+          {icon = GetImage('blue_xtc'),    title = 'Blue XTC',   description = '1 X Raw XTC and 1 X Crack Rock',  event = event,  args = { data = type, color = 'blue'}},
         }
       }) 
-      lib.showContext('XTCmenu')
+    lib.showContext('XTCmenu')
 end)
 
 RegisterNetEvent("md-drugs:client:GetPressBack", function(type, press)
-    if not progressbar('Packing Up The Press', 5000, 'uncuff') then return end
+    if not progressbar(Lang.xtc.pickup, 5000, 'uncuff') then return end
     DeleteObject(press)
     xtcpress = false
     TriggerServerEvent("md-drugs:server:getpressback", type)
 end)
 
 RegisterNetEvent("md-drugs:client:stealisosafrole", function(data) 
-    if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
+    if not minigame() then Notify(Lang.xtc.fail, "error") return end
     if not progressbar(Lang.xtc.iso, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:stealisosafrole",data.data)
 end)
 
 
 RegisterNetEvent("md-drugs:client:stealmdp2p", function(data) 
-    if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
+    if not minigame() then Notify(Lang.xtc.fail, "error") return end
     if not progressbar(Lang.xtc.mdp2p, 4000, 'uncuff') then return end
     TriggerServerEvent("md-drugs:server:stealmdp2p", data.data)   
 end)
@@ -137,75 +75,64 @@ end)
 ------------------------------------------------------------------ Stamping
 
 RegisterNetEvent("md-drugs:client:stampwhite", function(data) 
-    lib.registerContext({
-    id = 'stampxtc',
-    title = 'Stamp XTC Menu',
+    lib.registerContext({ id = 'stampxtc', title = 'Stamp XTC Menu',
     options = {
-      {
-        icon = GetImage('white_xtc'),
-        title = 'White XTC',
+      { icon = GetImage('white_xtc'), title = 'White XTC',
         onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping White Pills', 4000, 'uncuff') then return end
+            if not minigame() then Notify(Lang.xtc.fail, "error") return end
+            if not progressbar(string.format(Lang.xtc.stamp, 'White'), 4000, 'uncuff') then return end
             TriggerServerEvent("md-drugs:server:stampwhite",data.data)
-        end      
+        end   
       },
-      {
-        icon = GetImage('red_xtc'),
-        title = 'Red XTC',
+      { icon = GetImage('red_xtc'), title = 'Red XTC',
         onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping Red Pills', 4000, 'uncuff') then return end
+            if not minigame() then Notify(Lang.xtc.fail, "error") return end
+            if not progressbar(string.format(Lang.xtc.stamp, 'Red'), 4000, 'uncuff') then return end
             TriggerServerEvent("md-drugs:server:stampred", data.data)
         end
       },
-      {
-        icon = GetImage('orange_xtc'),
-        title = 'Orange XTC',
+      { icon = GetImage('orange_xtc'), title = 'Orange XTC',
         onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping Orange Pills', 4000, 'uncuff') then return end
+            if not minigame() then Notify(Lang.xtc.fail, "error") return end
+            if not progressbar(string.format(Lang.xtc.stamp, 'Orange'), 4000, 'uncuff') then return end
             TriggerServerEvent("md-drugs:server:stamporange", data.data)
         end,
       },
-      {
-        icon = GetImage('blue_xtc'),
-        title = 'Blue XTC',
+      { icon = GetImage('blue_xtc'), title = 'Blue XTC',
         onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping Blue Pills', 4000, 'uncuff') then return end
+            if not minigame() then Notify(Lang.xtc.fail, "error") return end
+            if not progressbar(string.format(Lang.xtc.stamp, 'Blue'), 4000, 'uncuff') then return end
             TriggerServerEvent("md-drugs:server:stampblue", data.data)
         end
       },
-      
     }
-  }) 
+  })
   lib.showContext('stampxtc')
 end)
 
 
 RegisterNetEvent("md-drugs:client:getsinglepress", function() 
-    if not progressbar('Buying Press', 4000, 'uncuff') then return end
+    if not progressbar(Lang.xtc.buyp, 4000, 'uncuff') then return end
 	TriggerServerEvent("md-drugs:server:buypress")
 end)
 
 
 RegisterNetEvent("md-drugs:client:exchangepresses", function(data) 
-   if not progressbar('Buying Press', 4000, 'uncuff') then return end
+   if not progressbar(Lang.xtc.buyp, 4000, 'uncuff') then return end
 	TriggerServerEvent("md-drugs:server:upgradepress", data.data)
 end)
 
 RegisterNetEvent("md-drugs:client:buypress", function() 
-    local img = GetImage('singlepress'),
+    local img = GetImage('singlepress')
      lib.registerContext({
-	 id = 'buypresses',
-	 title = 'Purchase Presses',
-	 options = {
-        {    title  = 'Single Press',                description  = 'Buy a single press for 20k',                                       icon = img,    event = 'md-drugs:client:getsinglepress'},
-        {    title  = 'Exchange Single For Dual',    description  = '20 of each unstamped single stack pill and your single press ',    icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'dual'}},
-        {    title  = 'Exchange Dual For Triple',    description  = '50 of each unstamped dual stack pill and your dual press ',        icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'triple'}},
-        {    title  = 'Exchange Triple For Quad',    description  = '150 of each unstamped Triple stack pill and your triple press ',   icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'quad'}} 
-	}	
+	    id = 'buypresses',
+	    title = 'Purchase Presses',
+	    options = {
+        {title  = Lang.xtc.press.title.single,  description  = Lang.xtc.des.title.single,   icon = img,    event = 'md-drugs:client:getsinglepress'},
+        {title  = Lang.xtc.press.title.dual,    description  = Lang.xtc.des.title.dual,     icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'dual'}},
+        {title  = Lang.xtc.press.title.triple,  description  = Lang.xtc.des.title.triple,   icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'triple'}},
+        {title  = Lang.xtc.press.title.quad,    description  = Lang.xtc.des.title.quad,     icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'quad'}} 
+	    }	
     })
   lib.showContext('buypresses')	
 end)

fxmanifest.lua

@@ -3,15 +3,13 @@ author "mustache_dom"
 description "drugs by mustache dom"
 fx_version "cerulean"
 game "gta5"
-version  '3.5.9'
+version  '3.8.0'
 client_scripts {
 	'client/**.lua',
-	'@PolyZone/client.lua',
-   	 '@PolyZone/CircleZone.lua',
 }
 
 server_scripts {
-    'server/**.lua',
+   	'server/**.lua',
 	'@oxmysql/lib/MySQL.lua',
 	
 }

items_install/item_names/ox_inventory.md

@@ -1,8 +1,9 @@
 	--md-drugs copy and paste below items to ox_inventory/data/items.lua
+	```
     ["coke"] = {
         label = "Raw Cocaine",
         weight = 1000,
-        stack = false,
+        stack =true,
         close = false,
         description = "Raw Cocaine",
         client = {
@@ -12,7 +13,7 @@
     ["cokebaggy"] = {
         label = "Bag Of Cocaine",
         weight = 1000,
-        stack = false,
+        stack =true,
         close = false,
         description = "A Small Bag Of Weak Cocaine",
         client = {
@@ -22,7 +23,7 @@
     ["empty_weed_bag"] = {
         label = "Empty Bag",
         weight = 1000,
-        stack = false,
+        stack =true,
         close = false,
         description = "Empty Bag To Put Product In",
         client = {
@@ -32,7 +33,7 @@
     ["coca_leaf"] = {
         label = "Cocaine leaves",
         weight = 1500,
-        stack = false,
+        stack =true,
         close = false,
         description = "Cocaine leaves that must be processed !",
         client = {
@@ -42,7 +43,7 @@
     ["poppyresin"] = {
         label = "Poppy resin",
         weight = 2000,
-        stack = false,
+        stack =true,
         close = false,
         description = "It sticks to your fingers when you handle it.",
         client = {
@@ -52,7 +53,7 @@
     ["heroin"] = {
         label = "Weak Heroin Powder",
         weight = 500,
-        stack = false,
+        stack =true,
         close = true,
         description = "Dragon Chasin?",
         client = {
@@ -62,7 +63,7 @@
     ["bakingsoda"] = {
         label = "Baking Soda",
         weight = 300,
-        stack = false,
+        stack =true,
         close = false,
         description = "Household Baking Soda!",
         client = {
@@ -72,7 +73,7 @@
     ["loosecoke"] = {
         label = "Loose Coke",
         weight = 100,
-        stack = false,
+        stack =true,
         close = true,
         description = "Cut Cocaine",
         client = {
@@ -82,7 +83,7 @@
     ["loosecokestagetwo"] = {
         label = "More Pure Loose Coke",
         weight = 100,
-        stack = false,
+        stack =true,
         close = true,
         description = "Cut Cocaine",
         client = {
@@ -92,7 +93,7 @@
     ["loosecokestagethree"] = {
         label = "Purest Loose Coke",
         weight = 100,
-        stack = false,
+        stack =true,
         close = true,
         description = "Cut Cocaine",
         client = {
@@ -122,7 +123,7 @@
     ["cokestagetwo"] = {
         label = "Better Raw Cocaine",
         weight = 100,
-        stack = false,
+        stack =true,
         close = false,
         description = "Raw cocaine",
         client = {
@@ -132,7 +133,7 @@
     ["cokestagethree"] = {
         label = "Best Raw Cocaine",
         weight = 100,
-        stack = false,
+        stack =true,
         close = false,
         description = "Raw cocaine",
         client = {
@@ -362,7 +363,7 @@
     ["heroinstagetwo"] = {
         label = "Better Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Raw Heroin",
         client = {
@@ -372,7 +373,7 @@
     ["heroinstagethree"] = {
         label = "Best Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Raw Heroin",
         client = {
@@ -382,7 +383,7 @@
     ["heroincut"] = {
         label = "Cut Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Cut Heroin",
         client = {
@@ -392,7 +393,7 @@
     ["heroincutstagetwo"] = {
         label = "Better Cut Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Cut Heroin",
         client = {
@@ -402,7 +403,7 @@
     ["heroincutstagethree"] = {
         label = "Best Cut Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Cut Heroin",
         client = {
@@ -412,7 +413,7 @@
     ["heroinlabkit"] = {
         label = "Heroin Lab Kit",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "How Can A Big Ass Table Fit In One Slot",
         client = {
@@ -422,7 +423,7 @@
     ["heroinvial"] = {
         label = "Vial Of Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Hmm, Maybe A Needle Can Help",
         client = {
@@ -432,7 +433,7 @@
     ["heroinvialstagetwo"] = {
         label = "Better Vial of Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Hmm, Maybe A Needle Can Help",
         client = {
@@ -442,7 +443,7 @@
     ["heroinvialstagethree"] = {
         label = "Best Vial Of Heroin",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Hmm, Maybe A Needle Can Help",
         client = {
@@ -492,7 +493,7 @@
     ["needle"] = {
         label = "Syringe",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "I Swear Officer, Its For Diabetes",
         client = {
@@ -502,7 +503,7 @@
     ["crackrock"] = {
         label = "Crack Rock",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "This Isnt The Rock The Hippie Girl Told Me About",
         client = {
@@ -512,7 +513,7 @@
     ["crackrockstagetwo"] = {
         label = "Better Crack Rock",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "This Rocks!",
         client = {
@@ -522,7 +523,7 @@
     ["crackrockstagethree"] = {
         label = "Best Crack Rock",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "This Rocks!",
         client = {
@@ -582,7 +583,7 @@
     ["vicodin_prescription"] = {
         label = "Vicie Prescription",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "If Only This Helped With The Pain inside",
         client = {
@@ -592,7 +593,7 @@
     ["adderal_prescription"] = {
         label = "Mdderal Prescription",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "I CAN DO EVERYTHING",
         client = {
@@ -602,7 +603,7 @@
     ["morphine_prescription"] = {
         label = "Morphin Prescription",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "I Cant Feel Anything",
         client = {
@@ -612,7 +613,7 @@
     ["xanax_prescription"] = {
         label = "Zany Prescription",
         weight = 250,
-        stack = false,
+        stack =true,
         close = false,
         description = "Ahhh Sweet Comfort",
         client = {
@@ -2157,5 +2158,16 @@
         description = "",
         client = {
             image = "gta5phone.png",
-        },
-},
+        }
+		},
+		 ["dextrobluntwrap"] = {
+        label = "Dextro Blunt Wrap",
+        weight = 100,
+        stack = true,
+        close = true,
+        description = "",
+        client = {
+            image = "dextrobluntwrap.png",
+        }
+    },
+```

items_install/item_names/qb-inventory.md

@@ -1,4 +1,7 @@
------------------- md-drugs Add the following Items to qb-core/shared/items.lua and - Add item images to your inventory script
+------------------ 
+
+### md-drugs Add the following Items to qb-core/shared/items.lua and - Add item images to your inventory script
+```
 	coke 		 	 	 	     = {name = "coke",           					label = "Raw Cocaine", 				    weight = 1000,		type = "item", 		image = "coke.png", 				    unique = false, 	useable = false, 	shouldClose = false,   combinable = nil,   description = "Raw Cocaine"},
     coca_leaf 		 	 	 	 = {name = "coca_leaf",           				label = "Cocaine leaves",	 		    weight = 1500,		type = "item", 		image = "coca_leaf.png", 			    unique = false, 	useable = false, 	shouldClose = false,   combinable = nil,   description = "Cocaine leaves that must be processed !"},
     poppyresin 		 	 	     = {name = "poppyresin",           				label = "Poppy resin",	 			    weight = 2000, 		type = "item", 		image = "poppyresin.png", 			    unique = false, 	useable = false, 	shouldClose = false,   combinable = nil,   description = "It sticks to your fingers when you handle it."},
@@ -216,7 +219,7 @@
     bluntwrap 				     = {name = "bluntwrap", 			    		label = "Blunt Wrap", 		    	weight = 100, 		type = "item", 		image = "bluntwrap.png", 			    	unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     leanbluntwrap 				 = {name = "leanbluntwrap", 			    	label = "Lean Blunt Wrap", 		    weight = 100, 		type = "item", 		image = "leanbluntwrap.png", 				unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     dextroblunt 				 = {name = "dextroblunt", 			    		label = "Dextro Blunt Wrap", 		weight = 100, 		type = "item", 		image = "dextroblunt.png", 			    	unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
-    --dextrobluntwrap 			 = {name = "dextrobluntwrap", 			    	label = "Dextro Blunt Wrap", 		weight = 100, 		type = "item", 		image = "dextrobluntwrap.png", 				unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
+    dextrobluntwrap 			 = {name = "dextrobluntwrap", 			    	label = "Dextro Blunt Wrap", 		weight = 100, 		type = "item", 		image = "dextrobluntwrap.png", 				unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     leanblunts 				     = {name = "leanblunts", 			    		label = "Lean Blunts", 		    	weight = 100, 		type = "item", 		image = "leanblunts.png", 			    	unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     dextroblunts 				 = {name = "dextroblunts", 			    		label = "Dextro Blunts", 		    weight = 100, 		type = "item", 		image = "dextroblunts.png", 				unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     chewyblunt 				     = {name = "chewyblunt", 			    		label = "Chewy", 		    		weight = 100, 		type = "item", 		image = "blunt.png", 			   			unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
@@ -224,4 +227,5 @@
     leancup 				     = {name = "leancup", 			    			label = "Empty Cup", 		    	weight = 100, 		type = "item", 		image = "leancup.png", 			   			unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     cupoflean 				     = {name = "cupoflean", 			    		label = "Lean Cup", 		    	weight = 100, 		type = "item", 		image = "cupoflean.png", 			    	unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     cupofdextro 				 = {name = "cupofdextro", 			    		label = "Dextro Cup", 		    	weight = 100, 		type = "item", 		image = "cupofdextro.png", 			    	unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
-    xtcburner 				     = {name = "xtcburner", 			    		label = "XTC Burner", 		    	weight = 100, 		type = "item", 		image = "gta5phone.png", 			    	unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
+    xtcburner 				     = {name = "xtcburner", 			    		label = "XTC Burner", 		    	weight = 100, 		type = "item", 		image = "gta5phone.png", 			    	unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
+	```

langs/arabic.lua

@@ -1,161 +0,0 @@
-Lang = {}
-
-Lang.Coke = {
-    -- شريط تقدم العميل
-    picking = "جمع الأوراق",
-    makepow = 'تقطيع الأوراق إلى مسحوق',
-    -- نهاية شريط التقدم
-    cut = "قمت بتقطيع بعض الكوكا",
-    nocutcoke = "لا يمكنك تقطيع الكوكا بدونها، أحمق",
-    bagcoke = "لقد قمت بتعبئة الكوكا",
-    nobagcoke = "لا يمكنك تعبئة الكوكا بدونها، أحمق",
-}
-Lang.Crack = {
-    -- العميل
-    cookcrack = "طهي الكراك",
-    bagcrack = 'تعبئة هذا',
-    -- الخادم
-    makecrack = 'كراك جيد',
-    nocoke = 'لا يمكنك صنع هذا بدون الكوكا'
-}
-Lang.Cornerselling = {
-    -- إشعارات العميل
-    toofar = "بعيد جدًا عن زاويتك، صديقي",
-    inacar = "لا يمكنك البيع أثناء الجلوس في السيارة",
-    deny = "إلى الجحيم بهذا العرض",
-    start = "احصل على تلك الأموال",
-    stop = "لا يمكن للشخص الكسول حتى بيع المخدرات",
-    nodrugs = "ماذا ستبيع؟ هواء؟",
-    notcops = "لا يوجد عدد كاف من رجال الشرطة",
-    -- نهاية إشعارات العميل
-    -- شريط التقدم
-    sell = "بيع المخدرات",
-}
-Lang.Delivery = {
-    -- العميل
-    search = "البحث عن توصيل ...",
-    none = "لا شيء قريب",
-    busy = "لم تنه أيضًا الذي قلت لك أن تنهيه",
-    found = "محدد على خريطتك",
-    already = "بالفعل توصيل",
-    checkrep = "سمعة البائع الحالية: ",
-    -- شريط التقدم
-    pack = 'تسليم الحزمة',
-    -- نهاية العميل
-}
-Lang.Heroin = {
-    -- العميل
-    pick = "جمع الأفيون",
-    tableout = 'لديك بالفعل طاولة معدة',
-    dryout = "تجفيف الأفيون",
-    cutting = "تقطيع الهيروين مع الصودا الخبز",
-    secret = "ششششش",
-    table = "وضع الطاولة",
-    success = "تسخين الهيروين بشكل جيد",
-    clean = 'تنظيف طاولة الهيروين',
-    needles = 'ملء الحقنة',
-    -- تعيين سيناريو الشخصيات المتوقع إرجاعها بالأمر التالي
-    cutheroin = 'قمت بتحضير بعض الهيروين المقطوع',
-    noheroin = "كيف يمكنك تقطيع الهيروين بدونه، أحمق",
-    vial = 'قمت بصنع قارورة هيروين',
-    novial = "كيف يمكنك صنع قوارير هيروين بدونه، أحمق",
-    fail = 'لقد سخنتهم كثيرًا، أحمق',
-    fill = 'تم ملء الحقنة',
-    nofill = 'كيف ستملأ الإبر بالهيروين بدونه'
-}
-Lang.Lean = {
-    marked = 'تم وضع علامة على السيارة على خريطتك',
-    lean = 'لقد حصلت على Lean الأرجواني',
-    dextro = 'لقد حصلت على ديكسترو أحمر'
-}
-
-Lang.lsd = {
-    steallys = 'سرقة حمض الليزرجيك',
-    stealdie = 'سرقة حمض الليزرجيك',
-    tableout = 'لديك بالفعل طاولة معدة',
-    tablepack = 'تعبئة الطاولة',
-    heat = 'تسخين السوائل',
-    clean = 'تنظيف الطاولة',
-    refine = 'تنقية الجودة',
-    dip = 'تغميس حمض الليزرجيك في الورق',
-    buypaper = 'شراء ورق التبن',
-    buykit = 'شراء مجموعة مختبر',
-    -- الخادم
-    lys = 'لقد حصلت على حمض الليزرجيك',
-    die = 'لقد حصلت على الديثيلاميد',
-    cleaned = 'لقد قمت بتنظيفه بشكل مثالي',
-    madelsd = 'لقد صنعت الإل إس دي!',
-    failed = 'لقد سخنتهم كثيرًا، أحمق',
-    refined = 'لقد قمت بتنقيتهم!',
-    broke = 'لا يمكنك تحمل هذا الآن!',
-    novial = 'لا يوجد قوارير إل إس دي، أحمق',
-}
-Lang.mescaline = {
-    pick = "جمع الصبار",
-    dry = 'تجفيف الصبار',
-    nocactus = 'لا توجد بصيلات صبار'
-}
-
-Lang.meth = {
-    inside = 'يوجد بالفعل شيء في الداخل',
-    increaseheat = 'زيادة الحرارة',
-    mission = 'تم وضع علامة على السيارة على خريطتك',
-    ace = 'لقد حصلت على بعض الأستون',
-    eph = 'لقد حصلت على بعض الإيفيدرين',
-    mix = 'إضافة أشياء إلى الخليط',
-    nobag = 'لا توجد حقائب'
-}
-
-Lang.oxy = {
-    truck = 'سيارتك هنا',
-    cantcarry = 'أنت لست قويًا لهذا، يمكنك حمل واحد فقط',
-    hand = 'تسليم الأكسيجين',
-    empty = 'لا يمكنك أن تكون بلا شيء في يدك، أحمق',
-    broke = 'لا يمكنك تحمل هذا المبلغ!',
-    hot = 'السيارة ساخنة، ارمها الآن',
-    next = 'انتقل إلى الموقع التالي'
-}
-
-Lang.Pharma = {
-    notems = 'أنت لست شخصًا طبيًا',
-    write = 'كتابة الوصفة الطبية',
-    fill = 'ملء الوصفة الطبية',
-    open = 'فتح الزجاجة',
-    pills = 'لقد حصلت على بعض الحبوب!',
-    no = 'ليس لديك وصفة طبية'
-}
-
-Lang.Shrooms = {
-    pick = 'جمع الفطر',
-    eat = 'أكل الفطر',
-    trip = 'رحلة ممتعة!'
-}
-
-Lang.Weed = {
-    pick = 'حصاد الحشيش',
-    busy = 'بالفعل تجفيف واحد',
-    canna = 'صنع زبدة الكانابينويد',
-    brown = 'صنع براونيز خاصة',
-    cook = 'صنع كوكيز خاصة',
-    Choc = 'صنع شوكولاتة خاصة',
-    muff = 'صنع مافن خاصة',
-    stovehot = 'الموقد ساخن جدًا، انتظر 30 ثانية ليبرد',
-    shat = 'صنع شاتر',
-    roll = 'لف السجائر',
-    -- 
-    nodry = 'تحتاج إلى حشيش رطب لتجفيفه',
-    noweed = 'لا يمكنك لف السجائر بالهواء',
-    noshat = 'تحتاج إلى شاتر للقيام بـ Dab',
-    notorch = 'تحتاج إلى شعلة بوتان'
-}
-
-Lang.xtc = {
-    out = 'لديك بالفعل ماكينة برس جاهزة',
-    pressing = 'ضغط الحبوب',
-    raw = 'صنع XTC خام',
-    mdp2p = 'سرقة MDP2P',
-    iso = 'سرقة إيزوسافرول',
-    fail = 'رفيق، إنه دائرة ليست علم صواريخ',
-    --
-    cash = 'أحتاج 20 ألف نقدًا'
-}

langs/danish.lua

@@ -1,167 +0,0 @@
-Lang = {}
-
-Lang.Coke = { 
-    -- klient side progressbarer
-    picking = "Plukker Blade",
-    makepow = 'Hakker Blade Til Pulver',
-    cutting = 'Blander Kokain Med Bagepulver',
-    bagging = "Pakker Denne Lort",
-    -- slut progressbarer
-    cut = "Du Har Skåret Noget Kokain",
-    nocutcoke = "Du Kan Ikke Skære Kokain Uden Kokain, Idiot",
-    bagcoke = "Du Har Pakket Kokain",
-    nobagcoke = "Du Kan Ikke Pakke Kokain Uden Kokain, Idiot",
-}
-Lang.Crack = {
-    --klient side
-    cookcrack = "Koger Noget Crack",
-    bagcrack = 'Pakker Denne Lort',
-    -- server
-    makecrack = 'Godt Crack',
-    nocoke = 'Du Kan Ikke Lave Dette Uden Kokain'
-}
-Lang.Cornerselling = {
-    -- klient side beskeder
-    toofar = "For Langt Væk Fra Dit Hjørne, Homie",
-    inacar = "Du Kan Ikke Sælge Mens Du Er I En Bil",
-    deny = "Fuck Det Tilbud",
-    start = "Tjen De Penge",
-    stop = "Doven Røv Kan Ikke Engang Sælge Stoffer",
-    nodrugs = "Hvad Vil Du Sælge? Luft?",
-    notcops = "Ikke Nok Betjente",
-    -- slut klient side beskeder
-    -- progressbarer
-    sell = "Sælger Stoffer",
-}
-Lang.Delivery = {
-    -- klient side
-    search = "Søger Efter En Levering ...",
-    none = "Intet I Nærheden",
-    busy = "Du Har Ikke Engang Færdiggjort Den Jeg Sagde Til Dig",
-    found = "Markeret På Dit Kort",
-    already = "Allerede Levering",
-    checkrep = "Nuværende Forhandler Repræsentation: ",
-    -- progressbarer
-    pack = 'Overrækker Pakke',
-    -- slut klient side
-}
-
-Lang.Heroin = {
-    --klient
-    pick = "Plukker Valmuer",
-    tableout = 'Du Har Allerede Et Bord Ude',
-    dryout = "Tørrer Valmuer",
-    cutting = "Blander Heroin Med Bagepulver",
-    secret = "SHHHHHHHHH",
-    table = "Sætter Bord Ned",
-    success = "Opvarmede Heroin Rigtigt",
-    clean = 'Rengør Heroin Bord',
-    needles = 'Fylder Sprøjte',
-    pickup = 'Tager Heroin Bord Op',
-    -- 
-    cutheroin = 'Du Lavede Noget Blandingsheroin',
-    noheroin = "Hvordan Kan Du Skære Heroin Uden Heroin, Idiot",
-    vial = 'Du Lavede Et Vial Med Heroin',
-    novial = "Hvordan Kan Du Lave Heroin Vialer Uden Heroin, Idiot",
-    fail = 'Du Overophedede Dem, Idiot',
-    fill = 'Fyldte Sprøjten',
-    nofill = 'Hvordan Vil Du Fylde Sprøjter Med Heroin Uden Heroin'
-}
-Lang.Lean = {
-    marked = 'Bil Er Markeret På Dit Kort',
-    lean = 'Du Har Purple Lean',
-    dextro = 'Du Har Rød Dextro'
-}
-
-Lang.lsd = {
-    steallys = 'Stjæler Lyserginsyre',
-    stealdie = 'Stjæler Lyserginsyre',
-    tableout = 'Du Har Allerede Et Bord Ude',
-    tablepack = 'Pakker Bord',
-    heat = 'Opvarmer Væsker',
-    clean = 'Rengør Bordet',
-    refine = 'Forfiner Kvaliteten',
-    dip = 'Dypper LSD På Papir',
-    buypaper = 'Køber Tab Papir',
-    buykit = 'Køber Lab Kit',
-    place = 'Sætter Bord Ned',
-    -- server
-    lys = 'Du Har Lyserginsyre',
-    die = 'Du Har Diethylamid',
-    cleaned = 'Du Rengjorde Det Perfekt',
-    madelsd = 'Du Lavede LSD!',
-    failed = 'Du Overophedede Dem, Idiot',
-    refined = 'Du Forfinede Dem!',
-    broke = 'Din Fattige Røv Har Ikke Råd Til Disse!',
-    novial = 'Ingen LSD Vialer, Idiot',
-}
-Lang.mescaline = {
-    pick = "Plukker Kaktus",
-    dry = 'Tørrer Kaktus',
-    nocactus = 'Ingen Kaktus Bulbs',
-    eat = 'Spiser Mescaline'
-}
-
-Lang.meth = {
-    inside = 'Ting Indeni Allerede',
-    increaseheat = 'Øger Varme',
-    mission = 'Bil Er Markeret På Dit Kort',
-    ace = 'Du Har Noget Aceton',
-    eph = 'Du Har Noget Efedrin',
-    mix = 'Tilsætter Ting Til Blandingen',
-    nobag = 'Ingen Poser'
-}
-
-Lang.oxy = {
-    truck = 'Din Lastbil Er Her',
-    cantcarry = 'Du Er Ikke Så Stærk, Du Kan Kun Bære En',
-    hand = 'Overrækker Oxy',
-    empty = 'Du Kan Ikke Være Tomhændet, Idiot',
-    broke = 'Din Fattige Røv Har Ikke Råd Til Dette',
-    hot = 'Bilen Er Hot, Dump Den Nu',
-    next = 'Kom Til Den Næste Lokation'
-}
-
-Lang.Pharma = {
-    notems = 'Du Er Ikke En Medicinsk Person',
-    write = 'Skriver Recept',
-    fill = 'Fylder Recept',
-    open = 'Åbner Flaske',
-    pills = 'Du Har Nogle Piller!',
-    no = 'Du Har Ingen Recept'
-}
-
-Lang.Shrooms = {
-    pick = 'Plukker Svampe',
-    eat = 'Spiser Svampe',
-    trip = 'Hav En God Tur!'
-}
-
-Lang.Weed = {
-    pick = 'Høster Weed',
-    busy = 'Tørrer Allerede En Ud',
-    canna = 'Laver Cannabis-smør',
-    brown = 'Laver Specielle Brownies',
-    cook = 'Laver Specielle Cookies',
-    Choc = 'Laver Speciel Chokolade',
-    muff = 'Laver Speciel Muffin',
-    stovehot = 'Komfuret Er For Varmt, Vent 30 Sekunder På At Køle Ned',
-    shat = 'Laver Shatter',
-    roll = 'Ruller Blunts',
-    -- 
-    nodry = 'Du Har Brug For Våd Cannabis Til At Tørre',
-    noweed = 'Kan Ikke Rulle En Blunt Med Luft',
-    noshat = 'Du Har Brug For Shatter Til At Lave En Dab',
-    notorch = 'Du Har Brug For En Butanbrænder'
-}
-
-Lang.xtc = {
-    out = 'Du Har Allerede En Presser Ude',
-    pressing = 'Presser Piller',
-    raw = 'Laver Rå XTC',
-    mdp2p = 'Stjæler MDP2P',
-    iso = 'Stjæler Isosafrol',
-    fail = 'Dude, Det Er En Cirkel, Ikke Raketteknologi',
-    --
-    cash = 'Jeg har brug for 20k i kontanter'
-}

langs/dutch.lua

@@ -1,154 +0,0 @@
-Lang = {}
-
-Lang.Coke = { 
-    picking = "Bladeren plukken",
-    makepow = 'Bladeren tot poeder malen',
-    cutting = 'Coke snijden met bakpoeder',
-    bagging = "Coke in zakken doen",
-    cut = "Je hebt wat coke gesneden",
-    nocutcoke = "Je kunt geen coke snijden zonder coke, idioot",
-    bagcoke = "Je hebt coke in zakken gedaan",
-    nobagcoke = "Je kunt geen coke in zakken doen zonder coke, idioot",
-}
-Lang.Crack = {
-    cookcrack = "Crack aan het maken",
-    bagcrack = 'Crack in zakken doen',
-    makecrack = 'Goede crack',
-    nocoke = 'Je kunt dit niet maken zonder coke'
-}
-Lang.Cornerselling = {
-    toofar = "Te ver van je hoek, maat",
-    inacar = "Je kunt niet verkopen terwijl je in een auto zit",
-    deny = "Fuck dat bod",
-    start = "Verdien wat geld",
-    stop = "Luie reet, kan niet eens drugs verkopen",
-    nodrugs = "Wat ga je verkopen? Lucht?",
-    notcops = "Niet genoeg agenten",
-    sell = "Drugs verkopen",
-}
-Lang.Delivery = {
-    search = "Op zoek naar een bezorging...",
-    none = "Niets in de buurt",
-    busy = "Je hebt nog niet eens degene afgemaakt die ik je vertelde",
-    found = "Gemarkeerd op je kaart",
-    already = "Al bezig met bezorgen",
-    checkrep = "Huidige handelaarsreputatie: ",
-    pack = 'Pakket overhandigen',
-}
-
-Lang.Heroin = {
-    pick = "Papaver plukken",
-    tableout = 'Je hebt al een tafel uitstaan',
-    dryout = "Papaver laten drogen",
-    cutting = "Heroin snijden met bakpoeder",
-    secret = "SSSTTTT",
-    table = "Tafel neerzetten",
-    success = "Heroin goed verwarmd",
-    clean = 'Heroïnetafel schoonmaken',
-    needles = 'Spuit vullen',
-    pickup = 'Heroïnetafel oppakken',
-    cutheroin = 'Je hebt wat gesneden heroïne gemaakt',
-    noheroin = "Hoe kun je heroïne snijden zonder heroïne, idioot",
-    vial = 'Je hebt een flacon heroïne gemaakt',
-    novial = "Hoe kun je heroïneflacons maken zonder heroïne, idioot",
-    fail = 'Je hebt ze te veel verhit, idioot',
-    fill = 'Vul de spuit',
-    nofill = 'Hoe ga je heroïne-naalden vullen zonder heroïne'
-}
-
-Lang.Lean = {
-    marked = 'Auto staat op je kaart',
-    lean = 'Je hebt paarse lean gekregen',
-    dextro = 'Je hebt rode dextro gekregen'
-}
-
-Lang.lsd = {
-    steallys = 'Lyserginezuur stelen',
-    stealdie = 'Lyserginezuur stelen',
-    tableout = 'Je hebt al een tafel uitstaan',
-    tablepack = 'Tafel inpakken',
-    heat = 'Vloeistoffen verwarmen',
-    clean = 'Tafel schoonmaken',
-    refine = 'Kwaliteit verfijnen',
-    dip = 'LSD op papier dippen',
-    buypaper = 'Tab-papier kopen',
-    buykit = 'Lab-kit kopen',
-    place = 'Tafel neerzetten',
-    lys = 'Je hebt lyserginezuur',
-    die = 'Je hebt di-ethylamide',
-    cleaned = 'Je hebt het perfect schoongemaakt',
-    madelsd = 'Je hebt LSD gemaakt!',
-    failed = 'Je hebt ze te veel verhit, idioot',
-    refined = 'Je hebt ze verfijnd!',
-    broke = 'Je arme reet kan dit niet betalen!',
-    novial = 'Geen LSD-flesjes, idioot',
-}
-
-Lang.mescaline = {
-    pick = "Cactus plukken",
-    dry = 'Cactus laten drogen',
-    nocactus = 'Geen cactusbollen',
-    eat = 'Mescaline eten'
-}
-
-Lang.meth = {
-    inside = 'Al iets binnen',
-    increaseheat = 'Hitte verhogen',
-    mission = 'Auto staat op je kaart',
-    ace = 'Je hebt wat aceton gekregen',
-    eph = 'Je hebt wat efedrine gekregen',
-    mix = 'Dingen toevoegen aan de mix',
-    nobag = 'Geen tassen'
-}
-
-Lang.oxy = {
-    truck = 'Je vrachtwagen is hier',
-    cantcarry = 'Je bent niet zo sterk, je kunt er maar één dragen',
-    hand = 'Oxy overhandigen',
-    empty = 'Je kunt niet met lege handen staan, idioot',
-    broke = 'Je arme reet kan dit niet betalen',
-    hot = 'Auto is heet, dump het nu',
-    next = 'Ga naar de volgende locatie'
-}
-
-Lang.Pharma = {
-    notems = 'Je bent geen medisch persoon',
-    write = 'Recept schrijven',
-    fill = 'Recept vullen',
-    open = 'Fles openen',
-    pills = 'Je hebt wat pillen!',
-    no = 'Je hebt geen recept'
-}
-
-Lang.Shrooms = {
-    pick = 'Paddenstoelen plukken',
-    eat = 'Paddenstoelen eten',
-    trip = 'Fijne reis!'
-}
-
-Lang.Weed = {
-    pick = 'Wiet oogsten',
-    busy = 'Ben al bezig met eentje te drogen',
-    canna = 'Wietboter maken',
-    brown = 'Speciale bruine maken',
-    cook = 'Speciale koekjes maken',
-    Choc = 'Speciale chocolade maken',
-    muff = 'Speciale muffin maken',
-    stovehot = 'Het fornuis is te heet, wacht 30 seconden om af te koelen',
-    shat = 'Shatter maken',
-    roll = 'Blunts rollen',
-    nodry = 'Je hebt natte cannabis nodig om te drogen',
-    noweed = 'Kan geen joint rollen zonder wiet',
-    noshat = 'Je hebt shatter nodig om te dabben',
-    notorch = 'Je hebt een gasbrander nodig'
-}
-
-Lang.xtc = {
-    out = 'Je hebt al een persmachine',
-    pressing = 'Pillen persen',
-    raw = 'Ruwe XTC maken',
-    mdp2p = 'MDP2P stelen',
-    iso = 'Iso safrole stelen',
-    fail = 'Dude, het is een cirkel, geen raketwetenschap',
-    cash = 'Ik heb 20k in contanten nodig'
-}

langs/japanese.lua

@@ -1,154 +0,0 @@
-Lang = {}
-
-Lang.Coke = { 
-    picking = "葉を摘む",
-    makepow = '葉を粉にする',
-    cutting = 'ベーキングソーダでコカインを切る',
-    bagging = "コカインを袋詰めする",
-    cut = "コカインを切った",
-    nocutcoke = "コカインがないと切れないよ、アホ",
-    bagcoke = "コカインを袋詰めした",
-    nobagcoke = "コカインがないと袋詰めできないよ、アホ",
-}
-Lang.Crack = {
-    cookcrack = "クラックを作る",
-    bagcrack = 'クラックを袋詰めする',
-    makecrack = 'いいクラック',
-    nocoke = 'コカインなしではこれは作れない'
-}
-Lang.Cornerselling = {
-    toofar = "あなたのコーナーから遠すぎる",
-    inacar = "車の中で売ることはできない",
-    deny = "そのオファーはダメだ",
-    start = "お金を稼ごう",
-    stop = "怠け者、薬さえ売れないのか",
-    nodrugs = "何を売るつもり？空気？",
-    notcops = "警官が足りない",
-    sell = "薬を売る",
-}
-Lang.Delivery = {
-    search = "配達を検索中...",
-    none = "近くに何もない",
-    busy = "まだ完成していないものを終えていない",
-    found = "あなたの地図にマークされた",
-    already = "すでに配達中",
-    checkrep = "現在のディーラーの評判：",
-    pack = 'パッケージを渡す',
-}
-
-Lang.Heroin = {
-    pick = "アヘンを摘む",
-    tableout = 'すでにテーブルが出ている',
-    dryout = "アヘンを乾燥させる",
-    cutting = "ベーキングソーダでヘロインを切る",
-    secret = "ひそかに",
-    table = "テーブルを置く",
-    success = "ヘロインを正しく加熱した",
-    clean = 'ヘロインテーブルを掃除する',
-    needles = '注射器を満たす',
-    pickup = 'ヘロインテーブルを拾う',
-    cutheroin = 'ヘロインを切った',
-    noheroin = "アヘンがないとヘロインを切れないよ、アホ",
-    vial = 'ヘロインのびんを作った',
-    novial = "アヘンがないとヘロインのびんを作れないよ、アホ",
-    fail = '加熱しすぎた、アホ',
-    fill = '注射器を満たす',
-    nofill = 'アヘンがないとヘロインの注射器を満たせないよ、アホ'
-}
-
-Lang.Lean = {
-    marked = '車が地図にマークされた',
-    lean = '紫色のリーンを手に入れた',
-    dextro = '赤いデキストロを手に入れた'
-}
-
-Lang.lsd = {
-    steallys = 'リゼルグ酸を盗む',
-    stealdie = 'リゼルグ酸を盗む',
-    tableout = 'すでにテーブルが出ている',
-    tablepack = 'テーブルをパッキングする',
-    heat = '液体を加熱する',
-    clean = 'テーブルを掃除する',
-    refine = '品質を高める',
-    dip = '紙にLSDを浸す',
-    buypaper = 'タブ用紙を購入する',
-    buykit = 'ラボキットを購入する',
-    place = 'テーブルを置く',
-    lys = 'リゼルグ酸を手に入れた',
-    die = 'ジエチルアミドを手に入れた',
-    cleaned = '完璧にきれいにした',
-    madelsd = 'LSDを作った！',
-    failed = '加熱しすぎた、アホ',
-    refined = '高めた！',
-    broke = 'あなたはこれを買うお金がありません！',
-    novial = 'LSDのびんがありません、アホ',
-}
-
-Lang.mescaline = {
-    pick = "サボテンを摘む",
-    dry = 'サボテンを乾燥させる',
-    nocactus = 'サボテンの球根がありません',
-    eat = 'メスカリンを食べる'
-}
-
-Lang.meth = {
-    inside = '中にはすでに何かある',
-    increaseheat = '熱を上げる',
-    mission = '車が地図にマークされた',
-    ace = 'アセトンを手に入れた',
-    eph = 'エフェドリンを手に入れた',
-    mix = '混ぜ物を追加する',
-    nobag = '袋がない'
-}
-
-Lang.oxy = {
-    truck = 'あなたのトラックはここにあります',
-    cantcarry = 'あなたはそんなに強くない、あなたは1つしか運べない',
-    hand = '酸素を手渡す',
-    empty = 'あなたは空手ではいられない、アホ',
-    broke = 'あなたはこれを払うお金がありません',
-    hot = '車が熱い、すぐにそれを投げ捨てる',
-    next = '次の場所に行く'
-}
-
-Lang.Pharma = {
-    notems = '医療関係者ではありません',
-    write = '処方箋を書く',
-    fill = '処方箋を埋める',
-    open = 'ボトルを開ける',
-    pills = 'いくつかの錠剤を手に入れた！',
-    no = '処方箋がありません'
-}
-
-Lang.Shrooms = {
-    pick = 'キノコを摘む',
-    eat = 'キノコを食べる',
-    trip = 'いい旅を！'
-}
-
-Lang.Weed = {
-    pick = '大麻を収穫する',
-    busy = 'すでに1つを乾かしています',
-    canna = 'キャナバターを作る',
-    brown = '特製ブラウニーを作る',
-    cook = '特製クッキーを作る',
-    Choc = '特製チョコレートを作る',
-    muff = '特製マフィンを作る',
-    stovehot = 'ストーブが熱すぎるので、30秒待って冷ます',
-    shat = 'シャターを作る',
-    roll = 'ブラントを巻く',
-    nodry = '乾燥させるためには湿った大麻が必要です',
-    noweed = '大麻なしではブラントを巻けません',
-    noshat = 'ダブするにはシャターが必要です',
-    notorch = 'ガスバーナーが必要です'
-}
-
-Lang.xtc = {
-    out = 'すでにプレスがあります',
-    pressing = '錠剤を押す',
-    raw = '生のXTCを作る',
-    mdp2p = 'MDP2Pを盗む',
-    iso = 'イソサフロールを盗む',
-    fail = '兄ちゃん、それは円形だ、ロケットサイエンスじゃない',
-    cash = '現金20kが必要です'
-}

langs/mandarin.lua

@@ -1,154 +0,0 @@
-Lang = {}
-
-Lang.Coke = { 
-    picking = "采摘叶子",
-    makepow = '将叶子研磨成粉末',
-    cutting = '用苏打粉切割可乐',
-    bagging = "包装可乐",
-    cut = "你切了一些可乐",
-    nocutcoke = "你不能没有可乐就切可乐，笨蛋",
-    bagcoke = "你装袋了可乐",
-    nobagcoke = "你不能没有可乐就装袋可乐，笨蛋",
-}
-Lang.Crack = {
-    cookcrack = "制作一些 crack",
-    bagcrack = '包装 crack',
-    makecrack = '不错的 crack',
-    nocoke = '没有可乐不能制作这个'
-}
-Lang.Cornerselling = {
-    toofar = "离你的拐角太远了，兄弟",
-    inacar = "你不能在车里卖东西",
-    deny = "拒绝那个出价",
-    start = "赚点钱",
-    stop = "懒鬼，甚至连卖毒品都不想做",
-    nodrugs = "你打算卖什么？空气吗？",
-    notcops = "警察不够",
-    sell = "正在销售毒品",
-}
-Lang.Delivery = {
-    search = "正在寻找交付...",
-    none = "附近没有东西",
-    busy = "你甚至还没有完成我告诉你的一个",
-    found = "标记在你的地图上",
-    already = "已经在交付中",
-    checkrep = "当前交易员声誉：",
-    pack = '交接包裹',
-}
-
-Lang.Heroin = {
-    pick = "采摘罂粟",
-    tableout = '你已经摆出了一张桌子',
-    dryout = "晾干罂粟",
-    cutting = "用苏打粉切割海洛因",
-    secret = "嘘",
-    table = "放置桌子",
-    success = "正确加热海洛因",
-    clean = '清洁海洛因桌',
-    needles = '填充针筒',
-    pickup = '捡起海洛因桌',
-    cutheroin = '你制造了一些剪切过的海洛因',
-    noheroin = "没有海洛因怎么能剪切海洛因？笨蛋",
-    vial = '你制作了一个海洛因小瓶',
-    novial = "没有海洛因怎么能制作海洛因小瓶？笨蛋",
-    fail = '你把它们加热过头了，笨蛋',
-    fill = '填充针筒',
-    nofill = '没有海洛因怎么填充海洛因的针筒？'
-}
-
-Lang.Lean = {
-    marked = '车子已标记在你的地图上',
-    lean = '你得到了紫色的瘾',
-    dextro = '你得到了红色的右旋'
-}
-
-Lang.lsd = {
-    steallys = '偷窃溴酸',
-    stealdie = '偷窃溴酸',
-    tableout = '你已经摆出了一张桌子',
-    tablepack = '打包桌子',
-    heat = '加热液体',
-    clean = '清洁桌子',
-    refine = '提纯品质',
-    dip = '把 LSD 涂在纸上',
-    buypaper = '购买标签纸',
-    buykit = '购买实验室工具',
-    place = '放置桌子',
-    lys = '你得到了溴酸',
-    die = '你得到了二乙酰胺',
-    cleaned = '你清洁得很好',
-    madelsd = '你制造了 LSD！',
-    failed = '你加热过头了，笨蛋',
-    refined = '你提纯了它们！',
-    broke = '你穷得买不起这些！',
-    novial = '没有 LSD 小瓶，笨蛋',
-}
-
-Lang.mescaline = {
-    pick = "采摘仙人掌",
-    dry = '晾干仙人掌',
-    nocactus = '没有仙人掌球',
-    eat = '吃麦斯卡林'
-}
-
-Lang.meth = {
-    inside = '里面已经有东西了',
-    increaseheat = '加热中',
-    mission = '车子已标记在你的地图上',
-    ace = '你得到了一些乙酸',
-    eph = '你得到了一些麻黄碱',
-    mix = '加入混合物',
-    nobag = '没有袋子'
-}
-
-Lang.oxy = {
-    truck = '你的卡车在这里',
-    cantcarry = '你不那么强壮，你只能搬运一个',
-    hand = '交付氧气',
-    empty = '你不能空手，笨蛋',
-    broke = '你穷得买不起这个',
-    hot = '车子很热，现在倾倒它',
-    next = '去下一个地点'
-}
-
-Lang.Pharma = {
-    notems = '你不是医生',
-    write = '开具处方',
-    fill = '填写处方',
-    open = '打开瓶子',
-    pills = '你得到了一些药丸！',
-    no = '你没有处方'
-}
-
-Lang.Shrooms = {
-    pick = '采摘蘑菇',
-    eat = '吃蘑菇',
-    trip = '祝你旅途愉快！'
-}
-
-Lang.Weed = {
-    pick = '收获大麻',
-    busy = '已经在晾干一个了',
-    canna = '制作大麻黄油',
-    brown = '制作特制棕子',
-    cook = '制作特制饼干',
-    Choc = '制作特制巧克力',
-    muff = '制作特制松饼',
-    stovehot = '炉子太热了，请等待 30 秒冷却',
-    shat = '制作特制糖霜',
-    roll = '卷烟',
-    nodry = '你需要湿大麻才能晾干',
-    noweed = '不能用空气卷烟',
-    noshat = '你需要糖霜来吸食',
-    notorch = '你需要打火机'
-}
-
-Lang.xtc = {
-    out = '你已经有一个压片机了',
-    pressing = '压片',
-    raw = '制作原始 XTC',
-    mdp2p = '偷窃 MDP2P',
-    iso = '偷窃异亚硫酸酯',
-    fail = '哥们，这是圆的不是火箭科学',
-    cash = '我需要 20k 现金'
-}

langs/spanish.lua

@@ -1,154 +0,0 @@
-Lang = {}
-
-Lang.Coke = { 
-    picking = "Recogiendo hojas",
-    makepow = 'Moliendo hojas en polvo',
-    cutting = 'Cortando coca con bicarbonato de sodio',
-    bagging = "Empacando coca",
-    cut = "Has cortado algo de coca",
-    nocutcoke = "No puedes cortar coca sin coca, idiota",
-    bagcoke = "Has empacado coca",
-    nobagcoke = "No puedes empacar coca sin coca, idiota",
-}
-Lang.Crack = {
-    cookcrack = "Cocinando crack",
-    bagcrack = 'Empacando crack',
-    makecrack = 'Buen crack',
-    nocoke = 'No puedes hacer esto sin cocaína'
-}
-Lang.Cornerselling = {
-    toofar = "Demasiado lejos de tu esquina, amigo",
-    inacar = "No puedes vender mientras estás en un auto",
-    deny = "A la mierda esa oferta",
-    start = "Consigue ese dinero",
-    stop = "El culo perezoso ni siquiera puede vender drogas",
-    nodrugs = "¿Qué vas a vender? ¿Aire?",
-    notcops = "No hay suficientes policías",
-    sell = "Vendiendo drogas",
-}
-Lang.Delivery = {
-    search = "Buscando una entrega...",
-    none = "Nada cerca",
-    busy = "Ni siquiera has terminado el que te dije",
-    found = "Marcado en tu mapa",
-    already = "Ya entregando",
-    checkrep = "Reputación actual del vendedor: ",
-    pack = 'Entregando paquete',
-}
-
-Lang.Heroin = {
-    pick = "Recogiendo amapolas",
-    tableout = 'Ya tienes una mesa fuera',
-    dryout = "Secando amapolas",
-    cutting = "Cortando heroína con bicarbonato de sodio",
-    secret = "SHHHHHHHHH",
-    table = "Colocando mesa",
-    success = "Calentaste la heroína adecuadamente",
-    clean = 'Limpiando mesa de heroína',
-    needles = 'Rellenando jeringa',
-    pickup = 'Recogiendo mesa de heroína',
-    cutheroin = 'Hiciste algo de heroína cortada',
-    noheroin = "¿Cómo puedes cortar heroína sin heroína, idiota?",
-    vial = 'Hiciste una ampolla de heroína',
-    novial = "¿Cómo puedes hacer ampollas de heroína sin heroína, idiota?",
-    fail = 'Los calentaste demasiado, idiota',
-    fill = 'Llenaste la jeringa',
-    nofill = '¿Cómo vas a llenar agujas de heroína sin heroína?'
-}
-
-Lang.Lean = {
-    marked = 'El auto está marcado en tu mapa',
-    lean = 'Tienes lean morado',
-    dextro = 'Tienes dextro rojo'
-}
-
-Lang.lsd = {
-    steallys = 'Robando ácido lisérgico',
-    stealdie = 'Robando ácido lisérgico',
-    tableout = 'Ya tienes una mesa fuera',
-    tablepack = 'Empacando mesa',
-    heat = 'Calentando líquidos',
-    clean = 'Limpiando mesa',
-    refine = 'Refinando la calidad',
-    dip = 'Sumerjiendo LSD en papel',
-    buypaper = 'Comprando papel de tab',
-    buykit = 'Comprando kit de laboratorio',
-    place = 'Colocando mesa',
-    lys = 'Tienes ácido lisérgico',
-    die = 'Tienes dietilamida',
-    cleaned = 'Lo limpiaste perfectamente',
-    madelsd = '¡Hiciste LSD!',
-    failed = 'Los calentaste demasiado, idiota',
-    refined = '¡Los refinaste!',
-    broke = '¡Tu culo quebrado no puede pagarlo!',
-    novial = '¡No hay ampollas de LSD, idiota!',
-}
-
-Lang.mescaline = {
-    pick = "Recogiendo cactus",
-    dry = 'Secando cactus',
-    nocactus = 'Sin bulbos de cactus',
-    eat = 'Comiendo mescalina'
-}
-
-Lang.meth = {
-    inside = 'Ya hay algo dentro',
-    increaseheat = 'Aumentando el calor',
-    mission = 'El auto está marcado en tu mapa',
-    ace = 'Tienes acetona',
-    eph = 'Tienes efedrina',
-    mix = 'Agregando cosas a la mezcla',
-    nobag = 'No hay bolsas'
-}
-
-Lang.oxy = {
-    truck = 'Tu camión está aquí',
-    cantcarry = 'No eres tan fuerte, solo puedes llevar uno',
-    hand = 'Entregando oxy',
-    empty = 'No puedes estar vacío, idiota',
-    broke = '¡Tu culo quebrado no puede pagarlo!',
-    hot = 'El auto está caliente, tíralo ahora',
-    next = 'Ve a la siguiente ubicación'
-}
-
-Lang.Pharma = {
-    notems = 'No eres una persona médica',
-    write = 'Escribiendo receta',
-    fill = 'Llenando receta',
-    open = 'Abriendo botella',
-    pills = '¡Tienes algunas píldoras!',
-    no = 'No tienes una receta'
-}
-
-Lang.Shrooms = {
-    pick = 'Recogiendo hongos',
-    eat = 'Comiendo hongos',
-    trip = '¡Ten un buen viaje!'
-}
-
-Lang.Weed = {
-    pick = 'Cosechando marihuana',
-    busy = 'Ya estoy secando uno',
-    canna = 'Haciendo mantequilla de marihuana',
-    brown = 'Haciendo brownies especiales',
-    cook = 'Haciendo galletas especiales',
-    Choc = 'Haciendo chocolate especial',
-    muff = 'Haciendo muffin especial',
-    stovehot = 'La estufa está demasiado caliente, espera 30 segundos para enfriar',
-    shat = 'Haciendo shatter',
-    roll = 'Enrollando blunts',
-    nodry = 'Necesitas marihuana húmeda para secar',
-    noweed = 'No puedes enrollar un blunt sin marihuana',
-    noshat = 'Necesitas shatter para hacer un dab',
-    notorch = 'Necesitas un soplete de butano'
-}
-
-Lang.xtc = {
-    out = 'Ya tienes una prensa',
-    pressing = 'Prensando pastillas',
-    raw = 'Haciendo XTC crudo',
-    mdp2p = 'Robando MDP2P',
-    iso = 'Robando isosafrol',
-    fail = 'Tío, es un círculo, no ciencia de cohetes',
-    cash = 'Necesito 20k en efectivo'
-}

langs/swedish.lua

@@ -1,157 +0,0 @@
-
-Lang = {}
-
-Lang.Coke = { 
-    picking = "Plockar löv",
-    makepow = 'Mal löv till pulver',
-    cutting = 'Skär kokain med bikarbonat',
-    bagging = "Fyller på påsar med kokain",
-    cut = "Du skar lite kokain",
-    nocutcoke = "Du kan inte skära kokain utan kokain, idiot",
-    bagcoke = "Du fyllde på påsar med kokain",
-    nobagcoke = "Du kan inte fylla på påsar med kokain utan kokain, idiot",
-}
-Lang.Crack = {
-    cookcrack = "Kokar crack",
-    bagcrack = 'Fyller på påsar med crack',
-    makecrack = 'Bra crack',
-    nocoke = 'Du kan inte göra detta utan kokain'
-}
-Lang.Cornerselling = {
-    toofar = "För långt från din hörna, kompis",
-    inacar = "Du kan inte sälja medan du är i en bil",
-    deny = "Fuck det erbjudandet",
-    start = "Skaffa pengarna",
-    stop = "Lat röv kan inte ens sälja droger",
-    nodrugs = "Vad ska du sälja? Luft?",
-    notcops = "Inte tillräckligt med poliser",
-    sell = "Säljer droger",
-}
-Lang.Delivery = {
-    search = "Söker efter en leverans...",
-    none = "Inget nära",
-    busy = "Du har inte ens slutfört den jag sa till dig",
-    found = "Markerat på din karta",
-    already = "Redan levererande",
-    checkrep = "Nuvarande återförsäljares rykte: ",
-    pack = 'Överlämnar paket',
-}
-
-Lang.Heroin = {
-    pick = "Plockar opiumvallmo",
-    tableout = 'Du har redan ett bord ute',
-    dryout = "Torkar opiumvallmo",
-    cutting = "Skär heroin med bikarbonat",
-    secret = "SHHHHHHHHH",
-    table = "Placerar bord",
-    success = "Värmt upp heroinet ordentligt",
-    clean = 'Rengör heroinbordet',
-    needles = 'Fyller spruta',
-    pickup = 'Plockar upp heroinbordet',
-    cutheroin = 'Du gjorde lite skuret heroin',
-    noheroin = "Hur kan du skära heroin utan heroin, idiot",
-    vial = 'Du gjorde en flaska med heroin',
-    novial = "Hur kan du göra heroinflaskor utan heroin, idiot",
-    fail = 'Du överhettade dem, idiot',
-    fill = 'Fyllde sprutan',
-    nofill = 'Hur ska du fylla nålar med heroin utan heroin'
-}
-
-Lang.Lean = {
-    marked = 'Bilen är markerad på din karta',
-    lean = 'Du fick lila lean',
-    dextro = 'Du fick rött dextro'
-}
-
-Lang.lsd = {
-    steallys = 'Stjäl lysergsyra',
-    stealdie = 'Stjäl lysergsyra',
-    tableout = 'Du har redan ett bord ute',
-    tablepack = 'Packar upp bordet',
-    heat = 'Värmer upp vätskor',
-    clean = 'Rengör bordet',
-    refine = 'Förfinar kvaliteten',
-    dip = 'Doppa LSD på papper',
-    buypaper = 'Köp flikpapper',
-    buykit = 'Köp laboratoriekit',
-    place = 'Placerar bord',
-    lys = 'Du fick lysergsyra',
-    die = 'Du fick dietilamid',
-    cleaned = 'Du rengjorde det perfekt',
-    madelsd = 'Du gjorde LSD!',
-    failed = 'Du överhettade dem, idiot',
-    refined = 'Du förfinade dem!',
-    broke = 'Din fattiga röv kan inte ha råd med det här!',
-    novial = 'Inga LSD-flaskor, idiot'
-}
-
-Lang.mescaline = {
-    pick = "Plockar kaktus",
-    dry = 'Torkar ut kaktus',
-    nocactus = 'Inga kaktusknoppar',
-    eat = 'Äter mescalin'
-}
-
-Lang.meth = {
-    inside = 'Något inuti redan',
-    increaseheat = 'Öka värmen',
-    mission = 'Bilen är markerad på din karta',
-    ace = 'Du fick acetone',
-    eph = 'Du fick efedrin',
-    mix = 'Lägger till saker i blandningen',
-    nobag = 'Inga påsar'
-}
-
-Lang.oxy = {
-    truck = 'Din lastbil är här',
-    cantcarry = 'Du är inte så stark, du kan bara bära en',
-    hand = 'Ger över oxy',
-    empty = 'Du kan inte vara tomhänt, idiot',
-    broke = 'Din fattiga röv kan inte ha råd med det här',
-    hot = 'Bilen är het, släng den nu',
-    next = 'Gå till nästa plats'
-}
-
-Lang.Pharma = {
-    notems = 'Du är inte en medicinsk person',
-    write = 'Skriva recept',
-    fill = 'Fyller recept',
-    open = 'Öppnar flaska',
-   
-
- pills = 'Du fick några piller!',
-    no = 'Du har inget recept'
-}
-
-Lang.Shrooms = {
-    pick = 'Plockar svampar',
-    eat = 'Äter svampar',
-    trip = 'Ha en trevlig resa!'
-}
-
-Lang.Weed = {
-    pick = 'Skördar cannabis',
-    busy = 'Redan torkar en',
-    canna = 'Gör cannabis-smör',
-    brown = 'Gör speciella brownies',
-    cook = 'Gör speciella kakor',
-    Choc = 'Gör speciell choklad',
-    muff = 'Gör speciell muffin',
-    stovehot = 'Spisen är för varm, vänta 30 sekunder för att svalna',
-    shat = 'Gör shatter',
-    roll = 'Rullar blunts',
-    nodry = 'Du behöver fuktig cannabis för att torka',
-    noweed = 'Kan inte rulla en blunt utan cannabis',
-    noshat = 'Du behöver shatter för att göra en dab',
-    notorch = 'Du behöver en butangasbrännare'
-}
-
-Lang.xtc = {
-    out = 'Du har redan en press',
-    pressing = 'Pressar piller',
-    raw = 'Gör rå XTC',
-    mdp2p = 'Stjäl MDP2P',
-    iso = 'Stjäl isosafrol',
-    fail = 'Kille, det är en cirkel, inte raketvetenskap',
-    cash = 'Jag behöver 20k i kontanter'
-}

patchnotes.txt

@@ -41,3 +41,63 @@ should be fully compatible with qbx without needing to make a couple edits now
 Added support for fivemerr logs
 3.5.8 -> 3.5.9 
 added command /cornersell **you only need to update server/cornserselling.lua** from previous update
+
+3.5.9 - > 3.7.0
+
+im bad at numbers sue me kek
+
+a lot has been changed with this version 
+The main thing to update from 3.5.9 to 3.7.0 is a couple things in your config 
+SAVE YOUR SHARED FOLDER AND COPY AND PASTE IT TO YOUR DESKTOP SO YOU HAVE A SECOND COPY
+
+```
+Config.oxtarget:
+ no longer exists in new version. Change it to 
+
+Config.Target = 'qb' -- qb or ox
+
+Config.minigametype:
+changed a little bit. you need to add this table to make things work now
+
+Config.Minigames = {
+    ps =            {    amount = 2,     speed = 8,},
+    ox =            { 'easy', 'easy'},   --easy medium or hard each one corresponds to how many skillchecks and the difficulty
+    blcirprog =     {    amount = 2,     speed = 50},       -- speed = 1-100
+    blprog =        {    amount = 1,     speed = 50},       -- speed = 1-100
+    blkeyspam =     {    amount = 1,     difficulty = 50}, -- difficulty = 1-100
+    blkeycircle =   {    amount = 1,     difficulty = 50, keynumbers = 3},
+    blnumberslide = {    amount = 1,     difficulty = 50, keynumbers = 3},
+    blrapidlines =  {    amount = 1,     difficulty = 50, numberofline = 3},
+    blcircleshake = {    amount = 1,     difficulty = 50, stages = 3},
+    glpath =        {    gridsize = 10,  lives = 3,     timelimit = 999999},
+    glspot =        {gridSize = 6, timeLimit = 999999, charSet = "alphabet", required = 10},
+    glmath =        {timeLimit = 300000},
+
+}
+
+what does this do, adds 10 more minigames than before you can use. How to set it, change Config.minigametype to the key of that table like ps ox blcirprog
+
+```
+
+Now thats the config changes so you dont need to reconfig everything as I do my best to not change much in the config and work around what has been done 
+
+Whats been added
+```
+i moved tier system to SQL as its better than using metadata
+run the SQL and it will autopopulate your metadata for rep so people wont lose anything
+
+I added a new sql table for deliveries
+
+it not checks overall time for deliveries regardless if you crash or not.
+
+Added new server file called recipes.lua
+
+its what you imagine, about 80-90% of the recipes for md-drugs
+
+```
+
+Is there bugs, probably. But im tired of beta testing it over and over so please report bugs to my discord where i can see them and patch them quickly. 
+
+
+3.7.0 -> 3.7.1
+slight bug fixes with ox items, meth targeting 

readme.md

@@ -1,4 +1,4 @@
-<h1>md-drugs</h1>
+# MD-Drugs 
 
 <div align="center">
   <a href="https://discord.gg/sAMzrB4DDx">
@@ -7,7 +7,7 @@
   <a href="https://discord.gg/sAMzrB4DDx">Mustache Scripts Discord</a><br>
 </div>
 
-<h1>Credits</h1>
+# Credits
 
 - I used [Samuel's development](https://fivem.samueldev.shop/) Christmas script global states and prop spawning (with permission obtained prior to release) in the development process.
 
@@ -26,130 +26,148 @@
 - [jixeltay](https://jixeltay.tebex.io/category/scripts) for putting out banger after banger. These people help the community learn so much more
 
 - Our partner [1of1 Servers]( https://1of1servers.com/) and their [discord](https://discord.gg/1of1servers) for their amazing server hosting! absolutely top notch.
-
-<h1>Special Thanks To Kamaryn For The Preview</h1>
+- Special Thanks To Kamaryn For The Preview
 - Thanks to Kamaryn for this [install guide video](https://youtu.be/zvuYnUfrqaA?si=FGJuBO5krZMC14Nd)
 
 - join their [discord](https://discord.gg/KPRmZqFS)  for other videos updates.
 
-<h1>Dependencies</h1>
-- [Ox Lib](https://github.com/overextended/ox_lib/releases/tag/v3.12.0) 
+# Dependencies
 
-- [qb-target](https://github.com/qbcore-framework/qb-target) **or** ox_target
+- [ox_lib](https://github.com/overextended/ox_lib/releases/tag/v3.12.0) 
+
+- [qb-target](https://github.com/qbcore-framework/qb-target) **or** [ox_target](https://github.com/overextended/ox_target)
   
-- emote script that uses the animations event (rpemotes, dpemotes, scully emotes all work)
+- emote script that uses the animations event
+    - for example one of these
+        - [dpemotes](https://github.com/andristum/dpemotes) -- should use RP instead
+        - [rpemotes](https://github.com/alberttheprince/rpemotes-reborn) 
+        - [scully_emotemenu](https://github.com/Scullyy/scully_emotemenu)
+
+- [read](https://letters.hookedonphonics.com/us/read-guaranteed-G14.html?vc=HPG1&pc=SHPGBR&tracking_id=102917836048989658da259e8c83e6&url_id=5586&oid=707&vid=1855&cid=4194&hid=14509&utm_source=1855&aff_id2={aff_id2}&utm_campaign=PracticePackHOS&utm_medium=S&utm_content=BrandDollarPacks&gc_id=184380999&h_ad_id=374941048206&src=O&qid=3&msvid=v2)
 
 - GAME BUILD 2944 OR LATER
 
 
+# Preview
 
-<h1>Preview</h1>
+### [Preview link](https://www.youtube.com/watch?v=I_x7_oz_SAU) 
 
-- [Preview link](https://www.youtube.com/watch?v=I_x7_oz_SAU)
-- **Preview**
+# How to install like a fuckin boss
 
-![](https://cdn.discordapp.com/attachments/1164709522691076120/1185729686135910582/image.png?ex=6590abd2&is=657e36d2&hm=35c3b2d4f55473d65dd9197a69052b7ec7ac7b28528811f3f59d5f306b7237eb&)
+### STEP 1
 
-<h1>How to install like a fuckin boss</h1>
+- qb-inventory users go to md-drugs/items_install/qb-inventory and add the Items to `qb-core/shared/items.lua` and - Add items from md-drugs/items_install/images to qb-inventory/html/images
+- ox_inventory users go to md-drugs/items_install/ox_inventory and add the Items to `ox_inventory/data/items.lua` and - Add items from md-drugs/items_install/images to ox_inventory/web/images
 
-- **STEP 1**
-	- qb-inventory users go to md-drugs/items_install/qb-inventory and add the Items to `qb-core/shared/items.lua` and - Add items from md-drugs/items_install/images to qb-inventory/html/images
-    - ox_inventory users go to md-drugs/items_install/ox_inventory and add the Items to `ox_inventory/data/items.lua` and - Add items from md-drugs/items_install/images to ox_inventory/web/images
+### STEP 2
+- delete `qb-drugs` 
 
-- **STEP 2**
+### STEP 3
+- Inside the config file change **all** the locations for everything.
+	- **ps:  All locations have been changed to make a preview video easier and with how big of a script this is, Im not going to config it for every city. THESE LOCATION DO NOT DO WELL FOR A LIVE SERVER SO CHANGE THEM**
 
- 	- delete `qb-drugs` 
-
-- **STEP 3**
-
-	-  Inside the config file change **all** the locations for everything.
-		- **ps:  All locations have been changed to make a preview video easier and with how big of a script this is, Im not going to config it for every city. THESE LOCATION DO NOT DO WELL FOR A LIVE SERVER SO CHANGE THEM**
-
-
-- **STEP 4**
+### STEP 4
  - Head to your emote script search for **uncuff** if it's missing add it
- - if rp or dpemotes then do this 
-
-```lua
-    ["uncuff"] = {"mp_arresting","a_uncuff","Uncuff", AnimationOptions = {     EmoteLoop = true,     EmoteMoving = true } },
-    ["edible"] = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "edible",    AnimationOptions = {        EmoteLoop = false,        EmoteMoving = true    }},
-    ["shootup"] = { "rcmpaparazzo1ig_4", "miranda_shooting_up", "Shoot Up",  AnimationOptions = {EmoteLoop = true,EmoteMoving = true,Prop = 'prop_syringe_01',  PansexualPropBone = 18905,PropPlacement = {0.11, 0.03, 0.0, -124.0, 0.0, 0.0},}},
-```
-
-- if scully emotes do this in emotes.lua
-```
-		{
-			Label = 'Uncuff',
-			Command = 'uncuff',
-			Animation = 'a_uncuff',
-			Dictionary = 'mp_arresting',
-			Options = {
-				Flags = {
-					Loop = true,
-					Move = true,
-				},
-			}
-		},
-		{
-			Label = 'Edibles',
-			Command = 'edible',
-			Animation = 'mp_player_int_eat_burger',
-			Dictionary = 'mp_player_inteat@burger',
-			Options = {
-				Flags = {
-					Loop = true,
-					Move = true,
-				},
-			}
-		},
-```
-then in prop emotes do 
-```
-{
-        Label = 'Shoot Up',
-        Command = 'shootup',
-        Animation = "miranda_shooting_up",
-        Dictionary = "rcmpaparazzo1ig_4",
-        Options = {
-            Flags = {
-                Loop = true,
-            },
-            Props = {
-                {
-                    Bone = 18905,
-                    Name = 'prop_syringe_01',
-                    Placement = {
-                        vector3(0.11, 0.03, 0.0),
-                         vector3( -124.0, 0.0, 0.0),
+    - if rpemotes do this 
+        - go to client/animationListCustom.lua 
+            - add these to the CustomDP.Emotes = {}
+            ```lua
+                ["uncuff"] = {"mp_arresting","a_uncuff","Uncuff", AnimationOptions = {     EmoteLoop = true,     EmoteMoving = true } },
+                ["edible"] = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "edible",    AnimationOptions = {        EmoteLoop = false,        EmoteMoving = true    }},
+            ```
+            - Add This to CustomDP.PropEmotes = {}
+            ```lua
+                ["shootup"] = { "rcmpaparazzo1ig_4", "miranda_shooting_up", "Shoot Up",  AnimationOptions = {EmoteLoop = true,EmoteMoving = true,Prop = 'prop_syringe_01',  PansexualPropBone = 18905,PropPlacement = {0.11, 0.03, 0.0, -124.0, 0.0, 0.0},}}
+            ```
+    - elseif dpemotes add this to client/AnimationList.lua
+        - add these to DP.Emotes = {}
+           ```lua
+                ["uncuff"] = {"mp_arresting","a_uncuff","Uncuff", AnimationOptions = {     EmoteLoop = true,     EmoteMoving = true } },
+                ["edible"] = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "edible",    AnimationOptions = {        EmoteLoop = false,        EmoteMoving = true    }},
+            ```
+        - add these to DP.PropEmotes = {}
+             ```lua
+                ["shootup"] = { "rcmpaparazzo1ig_4", "miranda_shooting_up", "Shoot Up",  AnimationOptions = {EmoteLoop = true,EmoteMoving = true,Prop = 'prop_syringe_01',  PansexualPropBone = 18905,PropPlacement = {0.11, 0.03, 0.0, -124.0, 0.0, 0.0},}}
+            ```
+    - elseif scullyemotes then 
+        - add this to emotes.lua
+            ```lua
+		        {
+		        	Label = 'Uncuff',
+		        	Command = 'uncuff',
+		        	Animation = 'a_uncuff',
+		        	Dictionary = 'mp_arresting',
+		        	Options = {
+		        		Flags = {
+		        			Loop = true,
+		        			Move = true,
+		        		},
+		        	}
+		        },
+		        {
+		        	Label = 'Edibles',
+		        	Command = 'edible',
+		        	Animation = 'mp_player_int_eat_burger',
+		        	Dictionary = 'mp_player_inteat@burger',
+		        	Options = {
+		        		Flags = {
+		        			Loop = true,
+		        			Move = true,
+		        		},
+		        	}
+		        },
+            ```
+        - then in prop emotes do 
+            ```lua
+            {
+                    Label = 'Shoot Up',
+                    Command = 'shootup',
+                    Animation = "miranda_shooting_up",
+                    Dictionary = "rcmpaparazzo1ig_4",
+                    Options = {
+                        Flags = {
+                            Loop = true,
+                        },
+                        Props = {
+                            {
+                                Bone = 18905,
+                                Name = 'prop_syringe_01',
+                                Placement = {
+                                    vector3(0.11, 0.03, 0.0),
+                                     vector3( -124.0, 0.0, 0.0),
+                                },
+                            },
+                        },
                     },
                 },
-            },
-        },
-    },
-```
+            ```
 
-- **STEP 5**
-	- check `qb-smallresources/config.lua` and if this exists, delete it 
-```
-[2] = { --Coke Processing Enter/Exit
-        [1] = {
-            poly = { coords = vector3(909.49, -1589.22, 30.51), heading = 92.24, length = 2, width = 2 },
-            allowVeh = false,
-            label = '[E] Enter Coke Processing'
-        },
-        [2] = {
-            poly = { coords = vector3(1088.81, -3187.57, -38.99), heading = 181.7, length = 2, width = 2 },
-            allowVeh = false,
-            label = '[E] Leave'
-        }
-    }
-```
-	
-	
-	
--- **OPTIONAL STEPS**
 
-<h1>Fivemerr</h1>
+# STEP 5
+- check `qb-smallresources/config.lua` and if this exists, delete it 
+    - look for this code
+        ```lua
+        [2] = { --Coke Processing Enter/Exit
+                [1] = {
+                    poly = { coords = vector3(909.49, -1589.22, 30.51), heading = 92.24, length = 2, width = 2 },
+                    allowVeh = false,
+                    label = '[E] Enter Coke Processing'
+                },
+                [2] = {
+                    poly = { coords = vector3(1088.81, -3187.57, -38.99), heading = 181.7, length = 2, width = 2 },
+                    allowVeh = false,
+                    label = '[E] Leave'
+                }
+            }
+        ```
+	
+# STEP 6
+- Run SQL
+	
+
+# OPTIONAL STEPS
+
+## Fivemerr
 This is NOT a requirement but something I personally use and believe in.
 
 
@@ -165,23 +183,20 @@ As well as a place to offload images and videos from fivem that doesnt rely on d
 - [Fivemerr Discord](https://discord.com/invite/fivemerr)
 - [Fivemerr Docs](https://docs.fivemerr.com/)
 
-- <h1>Radial Menu </h1>
-	- head to `qb-radial/config.lua` and search for the following event
+# Radial Menu
+- head to `qb-radial/config.lua` and search for the following event
 ```lua
      event = 'qb-drugs:client:cornerselling',
 ```
-![](https://cdn.discordapp.com/attachments/1164709522691076120/1185724912648867940/image.png?ex=6590a760&is=657e3260&hm=51534201d8d3e71f79a5c1678879ed8423f381a4a31c62f1bce6caf73782abe0&)
-
+- and change it to this
 ```lua
      event = 'md-drugs:client:cornerselling',
 ```
 
-![](https://cdn.discordapp.com/attachments/1164709522691076120/1185725132975644753/image.png?ex=6590a795&is=657e3295&hm=97d7f60ec6c4508af92f758c00669b1d52fe673c6481434b586f81cf29c1f292&)
-or just use the command /cornersell
 
-<h1>For Qb-shops users</h1>
+# For Qb-shops users
 
-	- Head to `qb-shops/config.lua` **Config.Products** and add the folowing items to OR anywhere else you want them. The Only way in this script to get them is to find the travelling merchant
+- Head to `qb-shops/config.lua` **Config.Products** and add the folowing items to OR anywhere else you want them. The Only way in this script to get them is to find the travelling merchant
 
 ```lua
 	{name = 'bakingsoda',   price = 100,   amount = 5000, info = {}, type = 'item'},
@@ -189,28 +204,7 @@ or just use the command /cornersell
 	{name = 'needle',    	price = 100,   amount = 5000, info = {}, type = 'item'},
 ```
 
-- <h1>Tier System</h1>
-	- Check Players.lua in the server folder of QB-Core. If you see
- 
-	```PlayerData.metadata['dealerrep'] = PlayerData.metadata['dealerrep'] or 0```
-
- 	- Then Place This directly under it
-       
-	```
-		PlayerData.metadata['coke'] = PlayerData.metadata['coke'] or 0
-		PlayerData.metadata['heroin'] = PlayerData.metadata['heroin'] or 0
-		PlayerData.metadata['lsd'] = PlayerData.metadata['lsd'] or 0
-	```
-
- **IF YOU DONT SEE THE ABOVE THEN GO TO THE CONFIG OF QB-Core**
-
-go to the config of qb-core and search metadata, underneath armor = 0, add this
-```
- 	lsd = 0,
-        coke = 0,
-        heroin = 0,
-	dealerrep = 0,
-```
-	
+# Tier System
+- Turn On Config.TierSystem after you run the sql file
 
 [mlo i use](https://www.gta5-mods.com/maps/mlo-4x-drug-lab-interiors-sp-fivem) heres an option. use it or dont. 

server/cocaine.lua

@@ -21,130 +21,97 @@ end
 
 RegisterNetEvent("coke:pickupCane")
 AddEventHandler("coke:pickupCane", function(loc)
-	local playerPed = GetPlayerPed(source)
-	
-	if CheckDist(source, playerPed, Config.CocaPlant[loc].location) then return end
+	local src = source
+	if CheckDist(src, Config.CocaPlant[loc].location) then return end
     if not Config.CocaPlant[loc].taken then
         Config.CocaPlant[loc].taken = true
         GlobalState.CocaPlant = Config.CocaPlant
         TriggerClientEvent("coke:removeCane", -1, loc)
         CaneCooldown(loc)
-        local Player = QBCore.Functions.GetPlayer(source)
-        AddItem('coca_leaf', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked A Coca Leaf With a distance of ' .. dist(source, playerPed, Config.CocaPlant[loc].location) .. ' vectors', 'coke')
+        AddItem(src, 'coca_leaf', 1)
+		Log(GetName(src) .. ' Picked A Coca Leaf With a distance of ' .. dist(src, Config.CocaPlant[loc].location) .. ' vectors', 'coke')
     end
 end)
 
-
 RegisterServerEvent('md-drugs:server:makepowder', function(num)
-	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.MakePowder[num]['loc']) then return end
-	if not Itemcheck(Player, 'coca_leaf', 1, 'true') then return end
-	if Config.TierSystem then		
-		local coke = Player.PlayerData.metadata['coke']
-		if coke <= Config.Tier1 then
-			if RemoveItem("coca_leaf", 1) then 
-				AddItem("coke", 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Raw Coke' .. dist(source, playerPed, Config.MakePowder[num]['loc']) .. ' vectors', 'coke')
-			end
-		elseif coke >= Config.Tier1 and coke <= Config.Tier2 then
-			if RemoveItem("coca_leaf", 1) then
-				 AddItem("cokestagetwo", 1)
-				 Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Raw Coke tier 2' .. dist(source, playerPed, Config.MakePowder[num]['loc']) .. ' vectors', 'coke')
-			end
-			
-		else
-			if RemoveItem("coca_leaf", 1) then
-				AddItem("cokestagethree", 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Raw Coke tier 3' .. dist(source, playerPed, Config.MakePowder[num]['loc']) .. ' vectors', 'coke')
-			end
-		end
-	else
-		if RemoveItem("coca_leaf", 1) then
-		 	AddItem("coke", 1)
-			 Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Raw Coke' .. dist(source, playerPed, Config.MakePowder[num]['loc']) .. ' vectors', 'coke')
-		end
-	end	
+    local src = source
+    if CheckDist(src, Config.MakePowder[num]['loc']) then return end
+    local tier = 'tier1'
+    local logMessage = ' Made Raw Coke'
+    if Config.TierSystem then
+        local coke = getRep(src, 'coke')
+        if coke > Config.Tier1 and coke <= Config.Tier2 then
+            tier = 'tier2'
+            logMessage = ' Made Raw Coke tier 2'
+        elseif coke > Config.Tier2 then
+            tier = 'tier3'
+            logMessage = ' Made Raw Coke tier 3'
+        end
+    end
+    if not GetRecipe(src, 'cocaine', 'cokepowder', tier) then return end
+    Log(GetName(src) .. logMessage .. dist(src, Config.MakePowder[num]['loc']) .. ' vectors', 'coke')
 end)
 
-
 RegisterServerEvent('md-drugs:server:cutcokeone', function()
-	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	if not Itemcheck(Player,'bakingsoda', 1, 'true') then return end
-	if Config.TierSystem then
-		local coke = Player.Functions.GetItemByName('coke')
-		local coke2 = Player.Functions.GetItemByName('cokestagetwo')
-		local coke3 = Player.Functions.GetItemByName('cokestagethree')
-		if coke then
-			RemoveItem('coke', 1 ) 
-			RemoveItem('bakingsoda', 1 )
-			AddItem('loosecoke', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Coke', 'coke')
-		elseif coke2 then
-			RemoveItem('cokestagetwo', 1 ) 
-			RemoveItem('bakingsoda', 1 ) 
-			AddItem('loosecokestagetwo', 1) 
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Coke tier 2', 'coke')
-		elseif coke3 then
-			RemoveItem('cokestagethree', 1 ) 
-			RemoveItem('bakingsoda', 1 ) 
-			AddItem('loosecokestagethree', 1) 
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Coke tier 3', 'coke')
-		else
-			Notifys(Lang.Coke.nocutcoke, "error")
-		end	
-	else
-		if RemoveItem('coke', 1 ) then
-			RemoveItem('bakingsoda', 1 ) 
-			AddItem('loosecoke', 1) 
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Coke', 'coke')
-		else
-			Notifys(Lang.Coke.nocutcoke, "error")
-		end	
-	end
+    local src = source
+    local Player = getPlayer(src)
+	local count = 0
+    if Config.TierSystem then
+        local cokeTiers = {
+            {item = 'coke', 		  tier = 'tier1', log = ' Cut Coke'},
+            {item = 'cokestagetwo',   tier = 'tier2', log = ' Cut Coke tier 2'},
+            {item = 'cokestagethree', tier = 'tier3', log = ' Cut Coke tier 3'}
+        }
+        for _, v in ipairs(cokeTiers) do
+			if count >= 1 then return end
+            if Player.Functions.GetItemByName(v.item) then
+                if not GetRecipe(src, 'cocaine', 'cutcoke', v.tier) then return end
+                	Log(GetName(src) .. v.log, 'coke')
+                return
+            end
+        end
+        Notifys(src, Lang.Coke.nocutcoke, "error")
+    else
+        if not GetRecipe(src, 'cocaine', 'cutcoke', 'tier1') then return end
+        Log(GetName(src) .. ' Cut Coke', 'coke')
+    end
 end)
 
 RegisterServerEvent('md-drugs:server:bagcoke', function()
-	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	if not Itemcheck(Player, 'empty_weed_bag', 1, 'true') then return end
-	if Config.TierSystem then
-		local coke = Player.PlayerData.metadata['coke']
-		local locoke = Player.Functions.GetItemByName('loosecoke')
-		local locoke2 = Player.Functions.GetItemByName('loosecokestagetwo')
-		local locoke3 = Player.Functions.GetItemByName('loosecokestagethree')
-		if locoke then
-			RemoveItem('loosecoke', 1 ) 
-			RemoveItem('empty_weed_bag', 1) 
-			AddItem('cokebaggy', 1) 
-			Player.Functions.SetMetaData('coke',  (coke + 1))
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Coke and now has a rep of ' .. coke + 1, 'coke')
-		elseif locoke2 then
-			RemoveItem('loosecokestagetwo', 1 ) 
-			RemoveItem('empty_weed_bag', 1) 
-			AddItem('cokebaggystagetwo', 1) 
-			Player.Functions.SetMetaData('coke',  (coke + 1))
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Coke tier 2 and now has a rep of ' .. coke + 1, 'coke')
-		elseif locoke3 then
-			RemoveItem('loosecokestagethree', 1 ) 
-			RemoveItem('empty_weed_bag', 1) 
-			AddItem('cokebaggystagethree', 1)
-			Player.Functions.SetMetaData('coke',  (coke + 1))
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Coke tier 3 and now has a rep of ' .. coke + 1, 'coke')
-		else
-			Notifys(Lang.Coke.nobagcoke, "error")
-		end
-	else
-		if RemoveItem('loosecoke', 1 ) then
-			RemoveItem('empty_weed_bag', 1) 
-			AddItem('cokebaggy', 1) 
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Coke', 'coke')
-		else
-			Notifys(Lang.Coke.nobagcoke, "error")
-		end
-	end
+    local src = source
+    local Player = getPlayer(src)
+	local count = 0
+    if Config.TierSystem then
+        local coke = getRep(src, 'coke')
+        local cokeTiers = {
+            {item = 'loosecoke', 		   tier = 'tier1', log = ' Bagged Coke'},
+            {item = 'loosecokestagetwo',   tier = 'tier2', log = ' Bagged Coke tier 2'},
+            {item = 'loosecokestagethree', tier = 'tier3', log = ' Bagged Coke tier 3'}
+        }
+        for _, v in ipairs(cokeTiers) do
+            if Player.Functions.GetItemByName(v.item) then
+				if count >= 1 then return end
+                if not GetRecipe(src, 'cocaine', 'bagcoke', v.tier) then return end
+                AddRep(src, 'coke')
+                Log(GetName(src) .. v.log .. ' and now has a rep of ' .. coke + 1, 'coke')
+                return
+            end
+        end
+        Notifys(src, Lang.Coke.nobagcoke, "error")
+    else
+        if not GetRecipe(src, 'cocaine', 'bagcoke', 'tier1') then return end
+        Log(GetName(src) .. ' Bagged Coke', 'coke')
+    end
 end)
 
+local cokecut = {loosecokestagetwo = 2, loosecokestagethree = 3}
+for k, v in pairs (cokecut) do
+	QBCore.Functions.CreateUseableItem(k, function(source, item)
+		local src = source
+		   local Player = getPlayer(src)
+		if Player.Functions.GetItemByName(item.name) then
+			if not Itemcheck(src, 'bakingsoda', 1) then return end
+			TriggerClientEvent('md-drugs:client:minusTier', src, {type = 'coke', xt = 'bakingsoda', item = k, amount =  v,recieve = 'loosecoke'})
+		end
+	end)
+end

server/consumables.lua

@@ -1,27 +1,24 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
-for k, v in pairs (Consumables.Items) do QBCore.Functions.CreateUseableItem(k, function(source, item)
-	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	if v.time == nil then v.time = Consumables.defaulttime end
-	if v.effect == nil then v.effect = 0 end
-	if v.anim == nil then v.anim = Consumables.defaultanim end
-	if v.progressbartext == nil then v.progressbartext = Consumables.defaultprogresstext end
-	if v.status == nil and v.statval == nil then v.status = 'thirst' v.statval = 0 end
-	if v.statval ~= nil and v.statval == nil then v.statval = Consumables.defaultstatval end
-		 TriggerClientEvent("md-drugs:client:consumedrugs", source, v.time, v.effect, v.anim, v.progressbartext, v.status,  v.statval, k) 
-	end)
+for k, v in pairs(Consumables.Items) do
+    QBCore.Functions.CreateUseableItem(k, function(source, item)
+        if not Itemcheck(source, k, 1) then return end
+        local time = v.time or Consumables.defaulttime
+        local effect = v.effect or 0
+        local anim = v.anim or Consumables.defaultanim
+        local progressbartext = v.progressbartext or Consumables.defaultprogresstext
+        local add = v.add or {hunger = 0}
+        TriggerClientEvent("md-drugs:client:consumedrugs", source, time, effect, anim, progressbartext, add, k)
+    end)
 end
 
 RegisterNetEvent('md-drugs:server:removeconsum', function(item)
-	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-		Player.Functions.RemoveItem(item, 1) 
-        Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got High With ' .. item .. '!', 'consuming')
-end)    
+	RemoveItem(source,item, 1) 
+    Log(GetName(source)  .. ' Got High With ' .. item .. '!', 'consuming')
+end)
 
 RegisterNetEvent('md-drugs:server:updatestatus', function(stat, statval)
-    local Player = QBCore.Functions.GetPlayer(source)
+    local Player = getPlayer(source)
     if stat == "thirst" then
         local value = Player.PlayerData.metadata.thirst + statval
         Player.Functions.SetMetaData('hunger', value)
@@ -31,7 +28,7 @@ RegisterNetEvent('md-drugs:server:updatestatus', function(stat, statval)
         Player.Functions.SetMetaData('thirst', value)
         TriggerClientEvent('hud:client:UpdateNeeds', source, Player.PlayerData.metadata.thirst, value)
     elseif stat == "stress" then 
-        local value = Player.PlayerData.metadata.hunger + statval
+        local value = Player.PlayerData.metadata.stress + statval
         Player.Functions.SetMetaData('stress', value)
         TriggerClientEvent('hud:client:UpdateStress', source, Player.PlayerData.metadata.stress, value)
     elseif stat == "armor" then
@@ -40,4 +37,4 @@ RegisterNetEvent('md-drugs:server:updatestatus', function(stat, statval)
         TriggerClientEvent('hud:client:UpdateStress', source, Player.PlayerData.metadata.armor, value)
     else
     end
-end)
+end)

server/cornerselling.lua

@@ -1,31 +1,34 @@
 local QBCore = exports['qb-core']:GetCoreObject()
-local StolenDrugs = {}
 
 lib.callback.register('md-drugs:server:cornerselling:getAvailableDrugs', function(source, cb)
-    local AvailableDrugs = {}
-    local Player = QBCore.Functions.GetPlayer(source)
+    local Player = getPlayer(source)
+    local rep = getRep(source, 'cornerselling')
     if not Player then return nil end
     local type = 0
-    for k in pairs(QBConfig.DrugsPrice) do
+    for k, v in pairs(QBConfig.DrugsPrice) do
         local item = Player.Functions.GetItemByName(k)
         if item and type == 0 then
             type = type + 1
-            Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Allowed To Sell ' .. item.name .. '!' , 'cornerselling')
-            return item.name, item.amount
+            Log(GetName(source)  .. ' Allowed To Sell ' .. item.name .. '!' , 'cornerselling')
+            local amount = math.random(1,item.amount)
+            if amount >= 15 then amount = 15 end
+            local price = math.random(QBConfig.DrugsPrice[k]['min'], QBConfig.DrugsPrice[k]['max']) * amount
+            local result = math.floor(price * rep.price)
+            return item.name, amount, result
         end
     end
     if type == 0 then 
-        return 'nothing', 0
+        return 'nothing', 0, 0
     end
 end)
 
 
 RegisterNetEvent('md-drugs:server:sellCornerDrugs', function(item, amount, price)
     local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-  
-    if RemoveItem(item, amount) then
-        Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Sold ' .. amount .. ' Of ' .. item .. ' For A Price Of ' .. price .. '!' , 'cornerselling')
+    local Player = getPlayer(src)
+    if RemoveItem(src, item, amount) then
+        AddRep(src, 'cornerselling', QBConfig.DrugsPrice[item].rep * amount)
+        Log(GetName(src)  .. ' Sold ' .. amount .. ' Of ' .. item .. ' For A Price Of ' .. price .. '!' , 'cornerselling')
         if QBConfig.MarkedBills then
             if price  >= QBConfig.DrugsPrice[item]['min'] * amount and price  <= QBConfig.DrugsPrice[item]['max'] * amount then 
                 local info = {
@@ -34,35 +37,20 @@ RegisterNetEvent('md-drugs:server:sellCornerDrugs', function(item, amount, price
                 Player.Functions.AddItem('markedbills', 1, false, info )
             end
         elseif QBConfig.CustomDirtyMoney then 
-            Player.Functions.AddItem(QBConfig.CustomDirtyMoneyitem,price)
+            AddItem(src, QBConfig.CustomDirtyMoneyitem, price)
         else
             Player.Functions.AddMoney('cash', price)
         end
     end 
 end)
 
-RegisterNetEvent('md-drugs:server:robCornerDrugs', function(drugType, amount)
-    local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-    local availableDrugs = getAvailableDrugs(src)
-
-    if not availableDrugs or not Player then return end
-
-    local item = availableDrugs[drugType].item
-
-    Player.Functions.RemoveItem(item, amount)
-    table.insert(StolenDrugs, {item = item, amount = amount})
-    TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "remove", amount)
-    TriggerClientEvent('md-drugs:client:refreshAvailableDrugs', src, getAvailableDrugs(src))
-end)
 lib.addCommand('cornersell', {
     help = 'Sell Things On The Corner',
     params = {
-       
     },
 }, function(source, args, raw)
     local src = source
-    local Player = QBCore.Functions.GetPlayer(source)
-    Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Used Command cornersell!' , 'cornerselling')
+    local Player = getPlayer(src)
+    Log(GetName(source)  .. ' Used Command cornersell!' , 'cornerselling')
     TriggerClientEvent('md-drugs:client:cornerselling', src)
 end)

server/crack.lua

@@ -1,88 +1,61 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
-
 RegisterServerEvent('md-drugs:server:makecrackone', function(num)
-	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.makecrack[num]['loc']) then end
-	if not Itemcheck(Player, 'bakingsoda', 1, 'true') then return end
-	if Config.TierSystem then
-		local locoke = Player.Functions.GetItemByName('loosecoke')
-		local locoke2 = Player.Functions.GetItemByName('loosecokestagetwo')
-		local locoke3 = Player.Functions.GetItemByName('loosecokestagethree')
-		if locoke then
-			RemoveItem('loosecoke', 1 ) 
-			RemoveItem('bakingsoda', 1) 
-			AddItem('crackrock', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Crack', 'crack')
-		elseif locoke2 then
-			RemoveItem('loosecokestagetwo', 1 ) 
-			RemoveItem('bakingsoda', 1) 
-			AddItem('crackrockstagetwo', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Crack', 'crack')
-		elseif locoke3 then
-			RemoveItem('loosecokestagethree', 1 ) 
-			RemoveItem('bakingsoda', 1) 
-			AddItem('crackrockstagethree', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Crack', 'crack')
-		else
-			Notifys(Lang.Crack.nocoke, 'error')
-		end			
-	else
-		if RemoveItem('loosecoke', 1 ) then
-			RemoveItem('bakingsoda', 1) 
-			AddItem('crackrock', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Crack', 'crack')
-		else
-			Notifys(Lang.Crack.nocoke, 'error')
-		end
-	end
+    local src = source
+    local Player = getPlayer(src)
+    local count,type, tier = 0, 'cookcrack', 'tier1'
+	if CheckDist(src, Config.makecrack[num]['loc']) then return end
+    if Config.TierSystem then
+        local crackTiers = {
+            {item = 'loosecoke', 		 tier = 'tier1', log = ' Cut Crack'},
+            {item = 'loosecokestagetwo', tier = 'tier2', log = ' Cut Crack tier 2'},
+            {item = 'loosecokestagethree', tier = 'tier3', log = ' Cut Crack tier 3'}
+        }
+        for _, v in ipairs(crackTiers) do
+            if count >= 1 then break end
+            print(v.item)
+            if Player.Functions.GetItemByName(v.item) then
+				tier = v.tier
+				count = count + 1
+                Log(GetName(src) .. v.log, 'crack')
+            end
+        end
+    end
+    print(tier)
+	if not GetRecipe(src, 'crack', type, tier) then return end
 end)
 
+
 RegisterServerEvent('md-drugs:server:bagcrack', function(num)
-	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.bagcrack[num]['loc']) then  return end
-	if not Itemcheck(Player, 'empty_weed_bag', 1, 'true') then return end
-	if Config.TierSystem then
-		local rock = Player.Functions.GetItemByName('crackrock')
-		local rock2 = Player.Functions.GetItemByName('crackrockstagetwo')
-		local rock3 = Player.Functions.GetItemByName('crackrockstagethree')
-		if rock then
-			RemoveItem('crackrock', 1 ) 
-			RemoveItem('empty_weed_bag', 1) 	
-			AddItem('baggedcracked', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Crack', 'crack')
-		elseif rock2 then
-			 RemoveItem('crackrockstagetwo', 1 ) 
-			RemoveItem('empty_weed_bag', 1) 
-			AddItem('baggedcrackedstagetwo', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Crack', 'crack')
-		elseif rock3 then
-			RemoveItem('crackrockstagethree', 1 ) 
-			RemoveItem('empty_weed_bag', 1) 
-			AddItem('baggedcrackedstagethree', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Crack', 'crack')
-		else
-			Notifys(Lang.Crack.nocoke, "error")
+    local src = source
+    local Player = getPlayer(src)
+    local count,type, tier = 0, 'bagcrack', 'tier1'
+    if Config.TierSystem then
+        local crackTiers = {
+            {item = 'crackrock', tier = 'tier1', log = ' Bagged Crack'},
+            {item = 'crackrockstagetwo', tier = 'tier2', log = ' Bagged Crack tier 2'},
+            {item = 'crackrockstagethree', tier = 'tier3', log = ' Bagged Crack tier 3'}
+        }
+        for _, v in ipairs(crackTiers) do
+            if count >= 1 then break end
+            if Player.Functions.GetItemByName(v.item) then
+				tier = v.tier
+				count = count + 1
+                Log(GetName(src) .. v.log, 'crack') 
+            end
+        end
+    end
+	if not GetRecipe(src, 'crack', type, tier) then return end
+end)
+
+local cokecut = {crackrockstagetwo = 2, crackrockstagethree = 3}
+for k, v in pairs (cokecut) do
+	QBCore.Functions.CreateUseableItem(k, function(source, item)
+		local src = source
+		local Player = getPlayer(src)
+		if Player.Functions.GetItemByName(item.name) then
+			if not Itemcheck(src, 'bakingsoda', 1) then return end
+			TriggerClientEvent('md-drugs:client:minusTier', src, {type = 'crack', xt = 'bakingsoda', item = k, amount =  v,recieve = 'crackrock'})
 		end
-	else
-		if RemoveItem('crackrock', 1 ) then
-			RemoveItem('empty_weed_bag', 1) 
-			AddItem('baggedcracked', 1) 
-			Notifys(Lang.Crack.makecrack, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged Crack', 'crack')
-		else
-			Notifys(Lang.Crack.nocoke, "error")
-		end
-	end
-end)
+	end)
+end

server/deliveries.lua

@@ -1,128 +1,67 @@
 QBCore = exports['qb-core']:GetCoreObject()
 
--- Functions
-exports('GetDealers', function()
-    return QBConfig.Dealers
-end)
 
 -- Callbacks
-QBCore.Functions.CreateCallback('md-drugs:server:RequestConfig', function(_, cb)
-    cb(QBConfig.Dealers)
-end)
-
--- Events
-RegisterNetEvent('md-drugs:server:updateDealerItems', function(itemData, amount, dealer)
-    local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-
-    if not Player then return end
-
-    if QBConfig.Dealers[dealer]["products"][itemData.slot].amount - 1 >= 0 then
-        QBConfig.Dealers[dealer]["products"][itemData.slot].amount = QBConfig.Dealers[dealer]["products"][itemData.slot].amount - amount
-        TriggerClientEvent('md-drugs:client:setDealerItems', -1, itemData, amount, dealer)
+lib.callback.register('md-drugs:server:getDealers', function(data)
+    local check = MySQL.query.await('SELECT * FROM dealers', {})
+    local loc = json.encode({x = 899.98, y = -2603.24, z = 6.11, h = 176.12 })
+    if not check[1] then 
+        MySQL.insert('INSERT INTO dealers SET name = ?, coords = ?, time = ?, createdby = ?', {'MD', loc, 'any', 'code Newb'})
+	Wait(2000)
+	local check2 = MySQL.query.await('SELECT * FROM dealers', {})
+        return check2
     else
-        Player.Functions.RemoveItem(itemData.name, amount)
-        Player.Functions.AddMoney('cash', amount * QBConfig.Dealers[dealer]["products"][itemData.slot].price)
-        TriggerClientEvent("QBCore:Notify", src, "none Left", "error")
+        return check
+    end
+end)
+    
+
+lib.callback.register('md-drugs:server:GetDeliveryItem', function(data)
+    local src = source
+    local Player = getPlayer(src)
+    local item = math.random(1, #QBConfig.DeliveryItems)
+    local amount = math.random(1,4)
+    local check = MySQL.query.await('SELECT * FROM deliveriesdealer WHERE cid = ?', {Player.PlayerData.citizenid})
+    local locnum = math.random(1, #QBConfig.DeliveryLocations)
+    local coord = json.encode({
+        x =  math.floor(QBConfig.DeliveryLocations[locnum].coords.x * 100) / 100,
+        y =  math.floor(QBConfig.DeliveryLocations[locnum].coords.y * 100) / 100,
+        z = math.floor(QBConfig.DeliveryLocations[locnum].coords.z * 100) / 100,
+    })
+    if not check[1] then
+        MySQL.insert('INSERT INTO deliveriesdealer SET cid = ?, itemdata = ?, timestart = ?, maxtime = ?, location = ?', 
+        {Player.PlayerData.citizenid, json.encode({item = QBConfig.DeliveryItems[item].item, amount = amount}), os.time(), os.time() + (15 * 60), coord })
+        AddItem(Player.PlayerData.source, QBConfig.DeliveryItems[item].item, amount)
+        return true, QBConfig.DeliveryItems[item].item, amount, coord
+    else
+        local time = os.time()
+        local timeout = math.floor(os.difftime(time, check[1].maxtime) / 60)
+        
+        if timeout > 15 then MySQL.query.await('DELETE FROM deliveriesdealer WHERE cid = ?', {Player.PlayerData.citizenid}) Notifys(src, 'You Failed To Make It In Time!', 'error' ) return false end
+        Notifys(src,'You Already Have A Delivery To Make', 'error' ) return false, QBConfig.DeliveryItems[item].item, amount, coord
     end
 end)
 
-RegisterNetEvent('md-drugs:server:giveDeliveryItems', function(deliveryData)
+RegisterNetEvent('md-drugs:server:giveDeliveryItems', function(item, amount)
     local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-    local item = QBConfig.DeliveryItems[deliveryData.item].item
-
-   if  Player.Functions.AddItem(item, deliveryData.amount) then
-    TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "add")
-	end
-end)
-
-RegisterNetEvent('md-drugs:server:successDelivery', function(deliveryData, inTime)
-    local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-    local item = QBConfig.DeliveryItems[deliveryData.item].item
-    local itemAmount = deliveryData.amount
-    local payout = deliveryData.itemData.payout * itemAmount
-    local copsOnline = QBCore.Functions.GetDutyCount('police')
-    local curRep = Player.PlayerData.metadata["dealerrep"]
-    local invItem = Player.Functions.GetItemByName(item)
-	
-	
-    if inTime then
-        if invItem and invItem.amount >= itemAmount then -- on time correct amount
-            Player.Functions.RemoveItem(item, itemAmount)
-            if copsOnline > 0 then
-                local copModifier = copsOnline * QBConfig.PoliceDeliveryModifier
-                if QBConfig.UseMarkedBills then
-                    local info = {worth = math.floor(payout * copModifier)}
-                    Player.Functions.AddItem('markedbills', 1, false, info)
-                else
-                    Player.Functions.AddMoney('cash', math.floor(payout * copModifier), 'drug-delivery')
-                end
-            else
-                if QBConfig.UseMarkedBills then
-                    local info = {worth = payout}
-                    Player.Functions.AddItem('markedbills', 1, false, info)
-                else
-                    Player.Functions.AddMoney('cash', payout, 'drug-delivery')
-                end
-            end
-            TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "remove")
-            TriggerClientEvent('QBCore:Notify', src, "You Got There In Time!", 'success')
-            SetTimeout(math.random(5000, 10000), function()
-                TriggerClientEvent('md-drugs:client:sendDeliveryMail', src, 'perfect', deliveryData)
-                Player.Functions.SetMetaData('dealerrep', (curRep + QBConfig.DeliveryRepGain))
-            end)
-        else
-            TriggerClientEvent('QBCore:Notify', src, "Wheres The Rest Of It", 'error')-- on time incorrect amount
-            if invItem then
-                local newItemAmount = invItem.amount
-                local modifiedPayout = deliveryData.itemData.payout * newItemAmount
-                Player.Functions.RemoveItem(item, newItemAmount)
-                TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "remove")
-                Player.Functions.AddMoney('cash', math.floor(modifiedPayout / QBConfig.WrongAmountFee))
-            end
-            SetTimeout(math.random(5000, 10000), function()
-                TriggerClientEvent('md-drugs:client:sendDeliveryMail', src, 'bad', deliveryData)
-                if curRep - 1 > 0 then
-                    Player.Functions.SetMetaData('dealerrep', (curRep - QBConfig.DeliveryRepLoss))
-                else
-                    Player.Functions.SetMetaData('dealerrep', 0)
-                end
-            end)
-        end
-    else
-        if invItem and invItem.amount >= itemAmount then -- late correct amount
-            TriggerClientEvent('QBCore:Notify', src, "Where Were You Slow Ass", 'error')
-            Player.Functions.RemoveItem(item, itemAmount)
-            Player.Functions.AddMoney('cash', math.floor(payout / QBConfig.OverdueDeliveryFee), "delivery-drugs-too-late")
-            TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "remove")
-            SetTimeout(math.random(5000, 10000), function()
-                TriggerClientEvent('md-drugs:client:sendDeliveryMail', src, 'late', deliveryData)
-                if curRep - 1 > 0 then
-                    Player.Functions.SetMetaData('dealerrep', (curRep - QBConfig.DeliveryRepLoss))
-                else
-                    Player.Functions.SetMetaData('dealerrep', 0)
-                end
-            end)
-        else
-            if invItem then -- late incorrect amount
-                local newItemAmount = invItem.amount
-                local modifiedPayout = deliveryData.itemData.payout * newItemAmount
-                TriggerClientEvent('QBCore:Notify', src, "Late And Missing Product GZ You Suck", 'error')
-                Player.Functions.RemoveItem(item, itemAmount)
-                Player.Functions.AddMoney('cash', math.floor(modifiedPayout / QBConfig.OverdueDeliveryFee), "delivery-drugs-too-late")
-                TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "remove")
-                SetTimeout(math.random(5000, 10000), function()
-                    TriggerClientEvent('md-drugs:client:sendDeliveryMail', src, 'late', deliveryData)
-                    if curRep - 1 > 0 then
-                        Player.Functions.SetMetaData('dealerrep', (curRep - QBConfig.DeliveryRepLoss))
-                    else
-                        Player.Functions.SetMetaData('dealerrep', 0)
-                    end
-                end)
+    local Player = getPlayer(src)
+    local check = MySQL.query.await('SELECT * FROM deliveriesdealer WHERE cid = ?', {Player.PlayerData.citizenid})
+    if not check[1] then return end
+    local time = os.time()
+    local timeout = math.floor(os.difftime(time, check[1].maxtime) / 60)
+    local itemData = json.decode(check[1].itemdata)
+    if timeout >= 15 then MySQL.query.await('DELETE FROM deliveriesdealer WHERE cid = ?', {Player.PlayerData.citizenid}) Notifys(source, 'You Failed To Make It In Time!', 'error' )  return end
+    if item ~= itemData.item then return end
+    if amount ~= itemData.amount then return end
+    if RemoveItem(src, item, amount) then
+       for k, v in pairs (QBConfig.DeliveryItems) do 
+            if v.item == item then 
+                local income = math.random(v.payout.min, v.payout.max) 
+                Player.Functions.AddMoney('cash', income) 
+                AddRep(src, 'dealerrep') 
             end
         end
+        MySQL.query.await('DELETE FROM deliveriesdealer WHERE cid = ?', {Player.PlayerData.citizenid})
     end
 end)
 
@@ -130,7 +69,7 @@ end)
 QBCore.Commands.Add("newdealer", "Place a dealer (Admin Only)", {{ name = "name", help = "Dealer name"},  { name = "min", help = "Minimum Time"}, {name = "max", help = "Maximum Time"}}, true, function(source, args)
     local ped = GetPlayerPed(source)
     local coords = GetEntityCoords(ped)
-    local Player = QBCore.Functions.GetPlayer(source)
+    local Player = getPlayer(source)
     if not Player then return end
     local dealerName = args[1]
     local minTime = tonumber(args[2])
@@ -173,63 +112,9 @@ QBCore.Commands.Add("deletedealer", "Delete a dealer (Admin Only)", {{
     end
 end, "admin")
 
-QBCore.Commands.Add("dealers", "View all dealers (Admin Only)", {}, false, function(source, _)
-    local DealersText = ""
-    if QBConfig.Dealers ~= nil and next(QBConfig.Dealers) ~= nil then
-        for _, v in pairs(QBConfig.Dealers) do
-            DealersText = DealersText .. "Name: " .. v["name"] .. "<br>"
-        end
-        TriggerClientEvent('chat:addMessage', source, {
-            template = '<div class="chat-message advert"><div class="chat-message-body"><strong>' .."List Of Dealers " .. '</strong><br><br> ' .. DealersText .. '</div></div>',
-            args = {}
-        })
-    else
-        TriggerClientEvent('QBCore:Notify', source, "No Dealers", 'error')
-    end
-end, "admin")
-
-QBCore.Commands.Add("dealergoto", "Teleport to a dealer (Admin Only)", {{
-    name = "name",
-    help = "Dealer name"
-}}, true, function(source, args)
-    local DealerName = tostring(args[1])
-    if QBConfig.Dealers[DealerName] then
-        local ped = GetPlayerPed(source)
-        SetEntityCoords(ped, QBConfig.Dealers[DealerName]['coords']['x'], QBConfig.Dealers[DealerName]['coords']['y'], QBConfig.Dealers[DealerName]['coords']['z'])
-        TriggerClientEvent('QBCore:Notify', source, "TelePorted", {dealerName = DealerName}, 'success')
-    else
-        TriggerClientEvent('QBCore:Notify', source, "Doesnt Exist", 'error')
-    end
-end, "admin")
-
-CreateThread(function()
-    Wait(500)
-    local dealers = MySQL.query.await('SELECT * FROM dealers', {})
-    if dealers[1] then
-        for _, v in pairs(dealers) do
-            local coords = json.decode(v.coords)
-            local time = json.decode(v.time)
-
-            QBConfig.Dealers[v.name] = {
-                ["name"] = v.name,
-                ["coords"] = {
-                    ["x"] = coords.x,
-                    ["y"] = coords.y,
-                    ["z"] = coords.z
-                },
-                ["time"] = {
-                    ["min"] = time.min,
-                    ["max"] = time.max
-                },
-                ["products"] = QBConfig.Products
-            }
-        end
-    end
-    TriggerClientEvent('md-drugs:client:RefreshDealers', -1, QBConfig.Dealers)
-	
-end)
 RegisterServerEvent("md-drugs:server:Dealershop", function(amount, value, item,  info)
-	local src = source local Player = QBCore.Functions.GetPlayer(src)
+	local src = source 
+    local Player = getPlayer(src)
 	local balance = Player.Functions.GetMoney(tostring(value)) 
 	if Player.Functions.RemoveMoney(tostring(value), tonumber(info) * tonumber(amount)) then
 		TriggerClientEvent('inventory:client:ItemBox', src, item.name, "add", amount)
@@ -238,4 +123,4 @@ RegisterServerEvent("md-drugs:server:Dealershop", function(amount, value, item,
 		TriggerClientEvent('QBCore:Notify', source,  "Can't give item!", "error")
 	end
 
-end)
+end)

server/functions.lua

@@ -1,5 +1,7 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 local notify = Config.Notify -- qb or ox
+
+------------------------------------------ logging stuff
 local logs = false 
 local logapi = GetConvar("fivemerrLogs", "")
 local endpoint = 'https://api.fivemerr.com/v1/logs'
@@ -20,6 +22,7 @@ else
     print'^1 logs disabled for md-drugs'
 end
 end)
+
 function Log(message, type)
 if logs == false then return end	
     local buffer = {
@@ -42,6 +45,7 @@ if logs == false then return end
          buffer = nil
      end)
 end
+---------------------------------------------------- inventory catcher
 local invname = ''
 CreateThread(function()
 if GetResourceState('ps-inventory') == 'started' then
@@ -51,10 +55,56 @@ elseif GetResourceState('qb-inventory') == 'started' then
 else
     invname = 'inventory'		
 end
-
 end)
 
-function Notifys(text, type)
+local inventory = ''
+
+CreateThread(function()
+if GetResourceState('ox_inventory') == 'started' then
+    inventory = 'ox'
+else
+    inventory = 'qb'
+end
+end)
+------------------------------------ Player Stuff functions
+function getPlayer(source) 
+    local src = source
+    local Player = QBCore.Functions.GetPlayer(src)
+    return Player
+end
+
+function GetName(source) 
+    local Player = getPlayer(source) 
+    return Player.PlayerData.charinfo.firstname .. ' ' .. Player.PlayerData.charinfo.lastname
+end
+
+function GetCoords(source) 
+    local ped = GetPlayerPed(source)
+    local playerCoords = GetEntityCoords(ped)
+    return playerCoords
+end
+
+function dist(source, coords)
+    local playerPed = GetPlayerPed(source)
+    local pcoords = GetEntityCoords(playerPed)
+    local dist = #(pcoords - coords)
+        return dist
+end
+
+function CheckDist(source, coords)
+    local playerPed = GetPlayerPed(source)
+    local pcoords = GetEntityCoords(playerPed)
+    local ok 
+    if #(pcoords - coords) < 4.0 then
+        return ok
+    else    
+        DropPlayer(source, 'md-drugs: You Were A Total Of ' .. #(pcoords - coords) .. ' Too Far Away To Trigger This Event') 
+        return false
+    end
+end
+
+
+function Notifys(source, text, type)
     local src = source
     if notify == 'qb' then
         TriggerClientEvent("QBCore:Notify", src, text, type)
@@ -63,94 +113,242 @@ function Notifys(text, type)
     elseif notify == 'okok' then
         TriggerClientEvent('okokNotify:Alert', src, '', text, 4000, type, false)
     else
-        print"dude, it literally tells you what to put in the config"    
+        print"^1 Look At The Config For Proper Alert Options"    
     end    
-end    
+end
 
-function Itemcheck(Player, item, amount, notify) 
-    local itemchecks = Player.Functions.GetItemByName(item)
-    local yes
-
-    if notify == nil then notify = false end
-    if itemchecks and itemchecks.amount >= amount then
-       yes = true  return yes
-    else 
-        if notify == 'true' then 
-            Notifys('You Need ' .. amount .. ' Of ' .. QBCore.Shared.Items[item].label .. ' To Do this', 'error') return else end 
-    end        
-end
-function dist(source, Player, coords)
-    local pcoords = GetEntityCoords(Player)
-    local dist = #(pcoords - coords)
-        return dist
-end
-function CheckDist(source,Player, coords)
-    local pcoords = GetEntityCoords(Player)
-    local ok 
-    if #(pcoords - coords) < 4.0 then
-        return ok
-    else    
-        DropPlayer(source, 'Too Far') return  end
-end
-function checkTable(player, table)
-	local need = 0
-	local have = 0
-	for k, v in pairs (table) do 
-		need = need + 1
-		if Itemcheck(player, k, v, 'true') then have = have + 1  end
-	end
-	if need == have then
-		return true
-	else
-	end
-end
-function RemoveItem( item, amount) 
-    local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-    if Player.Functions.RemoveItem(item, amount) then TriggerClientEvent(invname ..":client:ItemBox", src, QBCore.Shared.Items[item], "remove", amount)  return true
-     else 
-        Notifys('You Need ' .. amount .. ' Of ' .. QBCore.Shared.Items[item].label .. ' To Do This', 'error')
+function GetLabels(item) 
+    if inventory == 'qb' then
+        return QBCore.Shared.Items[item].label
+    elseif inventory == 'ox' then
+        local items = exports.ox_inventory:Items()
+        return items[item].label
     end
 end
 
-function AddItem(item, amount) 
-    local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-    if Player.Functions.AddItem(item, amount) then TriggerClientEvent(invname ..":client:ItemBox", src, QBCore.Shared.Items[item], "add", amount) return true
-     else 
-        print('you sucks')
+function Itemcheck(source, item, amount) 
+    if inventory == 'qb' then
+        local Player = getPlayer(source)
+        local itemchecks = Player.Functions.GetItemByName(item)
+        if itemchecks and itemchecks.amount >= amount then
+            return true
+        else 
+            Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item)  .. ' To Do this', 'error')
+            return false   
+        end
+    elseif inventory == 'ox' then
+       local items = exports.ox_inventory:GetItem(source, item, nil, false) 
+        if items.count >= amount then 
+                return true
+        else
+            Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do This', 'error')
+            return false
+        end
     end
 end
 
-function Notifysu(text, type, source)
-    
-    if notify == 'qb' then
-        TriggerClientEvent("QBCore:Notify", source, text, type)
-    elseif notify == 'ox' then
-        lib.notify(source, { title = text, type = type})
-    elseif notify == 'okok' then
-        TriggerClientEvent('okokNotify:Alert', source, '', text, 4000, type, false)
+function RemoveItem(source, item, amount) 
+    if inventory == 'qb' then
+        local Player = getPlayer(source)
+        if Player.Functions.RemoveItem(item, amount) then 
+            TriggerClientEvent(invname ..":client:ItemBox", source, QBCore.Shared.Items[item], "remove", amount)  
+            return true
+        else 
+            Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do This', 'error')
+        end
+    elseif inventory == 'ox' then
+        if exports.ox_inventory:RemoveItem(source, item, amount) then 
+            return true
+        else
+            Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do This', 'error')
+        end
+    end
+end
+
+function AddItem(source, item, amount) 
+    if inventory == 'qb' then
+        local Player = getPlayer(source)
+        if Player.Functions.AddItem(item, amount) then 
+            TriggerClientEvent(invname ..":client:ItemBox", source, QBCore.Shared.Items[item], "add", amount) 
+            return true
+         else 
+            print('Failed To Give Item: ' .. item .. ' Check Your qb-core/shared/items.lua')
+            return false
+        end
     else
-        print"dude, it literally tells you what to put in the config"    
-    end    
-end  
-
-function RemoveItemu( item, amount, source) 
-    local Player = QBCore.Functions.GetPlayer(source)
-    if Player.Functions.RemoveItem(item, amount) then TriggerClientEvent(invname ..":client:ItemBox", source, QBCore.Shared.Items[item], "remove", amount)  return true
-     else 
-        Notifysu('You Need ' .. amount .. ' Of ' .. QBCore.Shared.Items[item].label .. ' To Do This', 'error', source)
+        local carry = exports.ox_inventory:CanCarryItem(source, item, amount)
+        if not carry then Notifys(source, 'You Cant Carry that Much Weight!', 'error') return false end
+        if exports.ox_inventory:AddItem(source, item, amount) then
+            return true
+        else
+            print('Failed To Give Item: ' .. item .. ' Check Your ox_inventory/data/items.lua')
+            return false
+        end
     end
 end
 
-function AddItemu(item, amount, source) 
-    local Player = QBCore.Functions.GetPlayer(source)
-    if Player.Functions.AddItem(item, amount) then TriggerClientEvent(invname ..":client:ItemBox", source, QBCore.Shared.Items[item], "add", amount) return true
-     else 
-        print('you sucks')
+
+function getRep(source, type) 
+    local Player = getPlayer(source) 
+    local sql = MySQL.query.await('SELECT * FROM drugrep WHERE cid = ?', {Player.PlayerData.citizenid}) 
+    if not sql[1] then
+        local table = json.encode({
+            coke = Player.PlayerData.metadata.coke or 0,
+            lsd = Player.PlayerData.metadata.lsd or 0,
+            heroin = Player.PlayerData.metadata.heroin or 0,
+            dealerrep = Player.PlayerData.metadata.dealerrep or 0,
+            cornerselling = {
+                price = QBConfig.SellLevel[1].price,
+                rep = 0,
+                label = QBConfig.SellLevel[1].label,
+                level = 1
+            }
+        })
+        MySQL.insert('INSERT INTO drugrep SET cid = ?, drugrep = ?, name = ?', {Player.PlayerData.citizenid, table, GetName(source)})
+        Wait(1000)
+        return json.decode(table)
+    else
+        local reps = json.decode(sql[1].drugrep)
+        local rep = ''
+        if reps.coke == nil then rep = reps[1] else rep = reps end
+        if type == 'coke' then
+            return rep.coke
+        elseif type == 'heroin' then
+            return rep.heroin
+        elseif type == 'lsd' then
+            return rep.lsd
+        elseif type == 'dealerrep' then
+            return rep.dealerrep
+        elseif type == 'cornerselling' then
+            return rep.cornerselling
+        else
+            print('^1 Error: No Valid Drug Rep Option Chosen') 
+        end
+        return false
+    end
+end
+
+function GetAllRep(source) 
+    local Player = getPlayer(source) 
+    local sql = MySQL.query.await('SELECT * FROM drugrep WHERE cid = ?', {Player.PlayerData.citizenid}) 
+    if not sql[1] then
+        local table = json.encode({
+            coke = Player.PlayerData.metadata.coke or 0,
+            lsd = Player.PlayerData.metadata.lsd or 0,
+            heroin = Player.PlayerData.metadata.heroin or 0,
+            dealerrep = Player.PlayerData.metadata.dealerrep or 0,
+            cornerselling = {
+                price = QBConfig.SellLevel[1].price,
+                rep = 0,
+                label = QBConfig.SellLevel[1].label,
+                level = 1
+            }
+        })
+        MySQL.insert('INSERT INTO drugrep SET cid = ?, drugrep = ?, name = ?', {Player.PlayerData.citizenid, table, GetName(source)})
+        Wait(1000)
+        return json.decode(table)
+    else
+        local rep = json.decode(sql[1].drugrep)
+        if rep.coke == nil then return rep[1] end
+        return rep
+    end
+end
+
+function AddRep(source, type, amount) 
+    if not amount then amount = 1 end
+    local Player = getPlayer(source) 
+    local sql = MySQL.query.await('SELECT * FROM drugrep WHERE cid = ?', {Player.PlayerData.citizenid}) 
+    local reps = json.decode(sql[1].drugrep)
+    local update
+    local rep = ''
+    if reps.coke == nil then rep = reps[1] else rep = reps end
+    if type == 'cornerselling' then
+        for k, v in pairs (QBConfig.SellLevel) do
+            if rep.cornerselling.level == k  then 
+                if rep.cornerselling.rep + amount >= v.maxrep then
+                    update = json.encode({coke = rep.coke, heroin = rep.heroin, lsd = rep.lsd, dealerrep = rep.dealerrep, cornerselling = {label = v.label, price = v.price, rep = rep.cornerselling.rep + amount, level = k + 1}})
+                else
+                    update = json.encode({coke = rep.coke, heroin = rep.heroin, lsd = rep.lsd, dealerrep = rep.dealerrep, cornerselling = {label = v.label, price = v.price, rep = rep.cornerselling.rep + amount, level = k}})
+                end
+            end
+        end 
+    elseif type == 'coke' then
+         update = json.encode({coke = rep.coke + amount, heroin = rep.heroin, lsd = rep.lsd, dealerrep = rep.dealerrep, cornerselling = rep.cornerselling})
+    elseif type == 'heroin' then
+        update = json.encode({coke = rep.coke, heroin = rep.heroin + amount, lsd = rep.lsd, dealerrep = rep.dealerrep, cornerselling = rep.cornerselling})
+    elseif type == 'lsd' then
+        update = json.encode({coke = rep.coke, heroin = rep.heroin, lsd = rep.lsd +amount , dealerrep = rep.dealerrep, cornerselling = rep.cornerselling})
+    elseif type == 'dealerrep' then
+        update = json.encode({coke = rep.coke, heroin = rep.heroin, lsd = rep.lsd, dealerrep = rep.dealerrep + amount, cornerselling = rep.cornerselling})
+    end
+    if update == '' then return false end
+        MySQL.update('UPDATE drugrep SET drugrep = ? WHERE cid = ?', {update, Player.PlayerData.citizenid})
+    return true
+end
+
+lib.addCommand('addCornerSellingTOREP', {
+    help = 'RUN THIS ONCE AND DELETE',
+    restricted = 'group.admin'
+}, function(source, args, raw)
+    local sql = MySQL.query.await('SELECT * FROM drugrep', {})
+    for k, v in pairs (sql) do 
+      local new = {}
+      local old = json.decode(v.drugrep)
+      local get = old[1] or old
+      table.insert(new, {
+                coke = get.coke,
+                lsd = get.lsd,
+                heroin = get.heroin,
+                dealerrep = get.dealerrep,
+                cornerselling = {
+                    price = QBConfig.SellLevel[1].price,
+                    rep = 0,
+                    label = QBConfig.SellLevel[1].label,
+                    level = 1
+                }
+            })
+      local news = json.encode(new)
+      MySQL.query.await('UPDATE drugrep SET drugrep = ? WHERE cid = ?', {news, v.cid})
+    end
+end)
+
+function sortTab(tbl, type)
+    table.sort(tbl, function(a, b)
+        return a[type] < b[type]
+    end)
+end
+
+function ChecknRemove(source, table) 
+    local Player = getPlayer(source) 
+    local hass = 0
+    local need = 0
+    for k, v in pairs (table) do
+        need = need + 1 
+        if inventory == 'qb' then
+            local itemchecks = Player.Functions.GetItemByName(k)
+            if itemchecks and itemchecks.amount >= v then
+                hass = hass + 1
+            else 
+                Notifys(source, 'You Need ' .. v .. ' Of ' .. GetLabels(k)  .. ' To Do this', 'error')
+            end
+        elseif inventory == 'ox' then
+             local items = exports.ox_inventory:GetItem(source, k, nil, false) 
+       		 if items.count >= v then 
+                  	hass = hass + 1
+       		 else
+            		Notifys(source, 'You Need ' .. v .. ' Of ' .. GetLabels(k) .. ' To Do This', 'error')
+        	end
+        end
+    end
+    if hass == need then 
+        for k, v in pairs (table) do 
+            RemoveItem(source, k, v) 
+        end
+        return true
+    else
+        return false
     end
 end
- 
 
 lib.callback.register('md-drugs:server:GetCoppers', function(source, cb, args)
     local amount = 0
@@ -163,13 +361,16 @@ lib.callback.register('md-drugs:server:GetCoppers', function(source, cb, args)
    return amount
 end)
 
+lib.callback.register('md-drugs:server:GetRep', function(source, cb, args)
+    local src = source
+    local rep = GetAllRep(source) 
+    return rep
+end)
+
 CreateThread(function()
     if not GetResourceState('ox_lib'):find("start") then 
        print('^1 ox_lib Is A Depndancy, Not An Optional ')
     end
-    if Config.minigametype == 'ps' and not GetResourceState('ps-ui'):find("start") then
-        print('^1 You Have Config.minigametype as ps but dont have ps-ui started')
-    end
 end)
 CreateThread(function()
     local url = "https://raw.githubusercontent.com/Mustachedom/md-drugs/main/version.txt"
@@ -181,3 +382,11 @@ CreateThread(function()
      end, "GET", "", "")
 end)
 
+RegisterServerEvent('md-drugs:server:AddMas', function(data) 
+    local src = source
+    if not data then return end
+    if not Itemcheck(src, data.xt, 1) then return end
+    if not RemoveItem(src, data.item, 1) then return end
+        RemoveItem(src, data.xt, 1) 
+        AddItem(src, data.recieve, data.amount)
+end)

server/heroin.lua

@@ -22,142 +22,105 @@ end
 
 RegisterServerEvent('md-drugs:server:removecleaningkitheroin', function(data)
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-
-	if RemoveItem("cleaningkit", 1) then
-		Notifys("Cleaned It Perfectly", "success")
+	if RemoveItem(src,"cleaningkit", 1) then
 		TriggerClientEvent("md-drugs:client:deletedirtyheroin", src, data)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Wiped Down Their Heroin Lab Kit!' , 'heroin')
+		Log(GetName(src) .. ' Wiped Down Their Heroin Lab Kit!' , 'heroin')
 	else
-		Notifys("You cant clean it with spit alone", "error")
+		Notifys(src, "You cant clean it with spit alone", "error")
 	end
 end)
 
 
 RegisterServerEvent("heroin:pickupCane", function(loc)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.PoppyPlants[loc].location) then return end
+	if CheckDist(source, Config.PoppyPlants[loc].location) then return end
     if not Config.PoppyPlants[loc].taken then
         Config.PoppyPlants[loc].taken = true
         GlobalState.PoppyPlants = Config.PoppyPlants
         TriggerClientEvent("heroin:removeCane", -1, loc)
         heroinCooldown(loc)
-        local Player = QBCore.Functions.GetPlayer(source)
-        AddItem('poppyresin', 1)
-        Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked A Poppies With a distance of ' .. dist(source, playerPed, Config.PoppyPlants[loc].location) .. ' vectors', 'heroin')
-    
+        AddItem(source, 'poppyresin', 1)
+        Log(GetName(source) .. ' Picked A Poppies With a distance of ' .. dist(source, Config.PoppyPlants[loc].location) .. ' vectors', 'heroin')
     end
 end)
 
 RegisterServerEvent('md-drugs:server:dryplant', function(num)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.dryplant[num]['loc']) then return end
-	if not Itemcheck(Player, 'poppyresin', 1, 'true') then return end
+	if CheckDist(source, Config.dryplant[num]['loc']) then return end
+	if not Itemcheck(source, 'poppyresin', 1) then return end
 	if Config.TierSystem then
-		local heroin = Player.PlayerData.metadata['heroin']
+		local heroin = getRep(src, 'heroin')
 		if heroin <= Config.Tier1 then
-			if RemoveItem("poppyresin", 1) then
-				AddItem("heroin", 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Heroin Powder With a distance of ' .. dist(source, playerPed, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
-			end
+			if not GetRecipe(src, 'heroin', 'dryheroin', 'tier1') then return end
+			Log(GetName(src) ..' Made Heroin Powder With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
 		elseif heroin >= Config.Tier1 and heroin <= Config.Tier2 then
-			if RemoveItem("poppyresin", 1) then
-				AddItem("heroinstagetwo", 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Heroin Powder Tier 2 With a distance of ' .. dist(source, playerPed, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
-			end
+			if not GetRecipe(src, 'heroin', 'dryheroin', 'tier2') then return end
+			Log(GetName(src) ..' Made Heroin Powder Tier 2 With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
 		else
-			if RemoveItem("poppyresin", 1) then
-				AddItem("heroinstagethree", 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Heroin Powder  Tier 3 With a distance of ' .. dist(source, playerPed, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
-			end
+			if not GetRecipe(src, 'heroin', 'dryheroin', 'tier3') then return end
+			Log(GetName(src) ..' Made Heroin Powder  Tier 3 With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
 		end
 	else
-		if RemoveItem("poppyresin", 1) then
-			AddItem("heroin", 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Heroin Powder With a distance of ' .. dist(source, playerPed, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
-			
-		end
+		if not GetRecipe(src, 'heroin', 'dryheroin', 'tier1') then return end
+		Log(GetName(src) ..' Made Heroin Powder With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin')
 	end
 end)
 
 
 RegisterServerEvent('md-drugs:server:cutheroin', function(num)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.cutheroinone[num]['loc']) then return end
-	if not Itemcheck(Player, 'bakingsoda', 1, 'true') then return end
+    local Player = getPlayer(src)
+	if CheckDist(source, Config.cutheroinone[num]['loc']) then return end
+	if not Itemcheck(src, 'bakingsoda', 1) then return end
 	if Config.TierSystem then
 		local rawh = Player.Functions.GetItemByName('heroin')
 		local rawh2 = Player.Functions.GetItemByName('heroinstagetwo')
 		local rawh3 = Player.Functions.GetItemByName('heroinstagethree')
 		if rawh then
-			RemoveItem('heroin', 1 ) 
-			RemoveItem('bakingsoda', 1 ) 
-			AddItem('heroincut',1) 
-			Notifys(Lang.Heroin.cutheroin, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Heroin With a distance of ' .. dist(source, playerPed, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
+			if not GetRecipe(src, 'heroin', 'cutheroin', 'tier1') then return end
+			Log(GetName(src) ..' Cut Heroin With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
 		elseif rawh2 then
-			RemoveItem('heroinstagetwo', 1 ) 
-			RemoveItem('bakingsoda', 1 ) 
-			AddItem('heroincutstagetwo', 1) 
-			Notifys(Lang.Heroin.cutheroin, "success")	
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Heroin Tier 2 With a distance of ' .. dist(source, playerPed, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
+			if not GetRecipe(src, 'heroin', 'cutheroin', 'tier2') then return end
+			Log(GetName(src) ..' Cut Heroin Tier 2 With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
 		elseif rawh3 then
-			RemoveItem('heroinstagethree', 1 ) 
-			RemoveItem('bakingsoda', 1 ) 
-			AddItem('heroincutstagethree', 1) 
-			Notifys(Lang.Heroin.cutheroin, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname ..  ' Cut Heroin Tier 3 With a distance of ' .. dist(source, playerPed, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
+			if not GetRecipe(src, 'heroin', 'cutheroin', 'tier3') then return end
+			Log(GetName(src) .. ' Cut Heroin Tier 3 With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
 		else
-			Notifys(Lang.Heroin.noheroin, "error")
+			Notifys(src, Lang.Heroin.noheroin, "error")
 		end
 	else
-		if RemoveItem('heroin', 1 ) then
-			RemoveItem('bakingsoda', 1 )
-			AddItem('heroincut',1)
-			Notifys(Lang.Heroin.cutheroin, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Cut Heroin With a distance of ' .. dist(source, playerPed, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
-		else
-			Notifys(Lang.Heroin.noheroin, "error")
-		end
+		if not GetRecipe(src, 'heroin', 'cutheroin', 'tier1') then return end
+		Log(GetName(src) ..' Cut Heroin With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin')
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:getheroinlabkit', function()
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
+	local Player = getPlayer(src)
 
-	if CheckDist(source, playerPed, vector3(Config.buyheroinlabkit.x,Config.buyheroinlabkit.y,Config.buyheroinlabkit.z)) then return end
+	if CheckDist(source, vector3(Config.buyheroinlabkit.x,Config.buyheroinlabkit.y,Config.buyheroinlabkit.z)) then return end
 	if Player.Functions.RemoveMoney('cash', Config.heroinlabkitprice) then
-		AddItem('heroinlabkit', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bought A Heroin lab Kit ' .. dist(source, playerPed, vector3(Config.buyheroinlabkit.x,Config.buyheroinlabkit.y,Config.buyheroinlabkit.z)) .. ' vectors', 'heroin')
+		AddItem(src, 'heroinlabkit', 1)
+		Log(GetName(src) ..' Bought A Heroin lab Kit ' .. dist(source, vector3(Config.buyheroinlabkit.x,Config.buyheroinlabkit.y,Config.buyheroinlabkit.z)) .. ' vectors', 'heroin')
 	else
-		Notifys('You Need '.. Config.heroinlabkitprice .. ' In Cash For This', 'error')
+		Notifys(src, 'You Need '.. Config.heroinlabkitprice .. ' In Cash For This', 'error')
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:getheroinlabkitback', function()
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(source)
-	if Player.Functions.AddItem("heroinlabkit", 1) then
-		Notifys('You Got Your Lab Kit Back', 'Success')
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Up Their Heroin Lab Kit Back At ' .. GetEntityCoords(playerPed) .. '!', 'heroin')
+local Player = getPlayer(src)
+	if AddItem(src, "heroinlabkit", 1) then
+		Log(GetName(src) ..' Picked Up Their Heroin Lab Kit Back At ' .. GetCoords(src) .. '!', 'heroin')
 	end
 end)
 
 QBCore.Functions.CreateUseableItem('heroinlabkit', function(source, item)
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(src)
-	if not Itemcheck(Player, 'heroinlabkit', 1, 'true') then return end
+local Player = getPlayer(src)
+	if not Itemcheck(source, 'heroinlabkit', 1) then return end
 	if TriggerClientEvent("md-drugs:client:setheroinlabkit", src) then
-		Player.Functions.RemoveItem("heroinlabkit", 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Placed Their Heroin Lab Kit Back At ' .. GetEntityCoords(playerPed) .. '!', 'heroin')
+		RemoveItem(src, "heroinlabkit", 1)
+		Log(GetName(src) ..' Placed Their Heroin Lab Kit Back At ' .. GetCoords(src) .. '!', 'heroin')
 	end
 end)
 
@@ -165,109 +128,78 @@ end)
 
 RegisterServerEvent('md-drugs:server:heatliquidheroin', function()
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-	if not Itemcheck(Player, 'emptyvial', 1, 'true') then return end
+local Player = getPlayer(src)
+	if not Itemcheck(source, 'emptyvial', 1) then return end
 	if Config.TierSystem then
 		local cuth = Player.Functions.GetItemByName('heroincut')
 		local cuth2 = Player.Functions.GetItemByName('heroincutstagetwo')
 		local cuth3 = Player.Functions.GetItemByName('heroincutstagethree')
 		if cuth then
-			RemoveItem('heroincut', 1) 
-			RemoveItem('emptyvial', 1) 
-			AddItem('heroinvial', 1)
-			Notifys(Lang.Heroin.vial, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Vial Of Heroin', 'heroin')
+			if not GetRecipe(src, 'heroin', 'fillvial', 'tier1') then return end
+			Log(GetName(src) ..' Made A Vial Of Heroin', 'heroin')
 		elseif cuth2 then
-			RemoveItem('heroincutstagetwo', 1) 
-			RemoveItem('emptyvial', 1) 
-			AddItem('heroinvialstagetwo', 1)
-			Notifys(Lang.Heroin.vial, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Vial Of Heroin Tier 2', 'heroin')
+			if not GetRecipe(src, 'heroin', 'fillvial', 'tier2') then return end
+			Log(GetName(src) ..' Made A Vial Of Heroin Tier 2', 'heroin')
 		elseif cuth3 then
-			RemoveItem('heroincutstagethree', 1) 
-			RemoveItem('emptyvial', 1) 
-			AddItem('heroinvialstagethree', 1)
-			Notifys(Lang.Heroin.vial, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Vial Of Heroin Tier 3', 'heroin')
+			if not GetRecipe(src, 'heroin', 'fillvial', 'tier3') then return end
+			Log(GetName(src) ..' Made A Vial Of Heroin Tier 3', 'heroin')
 		else
-			Notifys(Lang.Heroin.novial, "error")
+			Notifys(src, 'no cut heroin', "error")
 		end
 	else
-		if RemoveItem('heroincut', 1) then
-			RemoveItem('emptyvial', 1) 
-			AddItem('heroinvial', 1)
-			Notifys(Lang.Heroin.vial, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Vial Of Heroin', 'heroin')
-		else
-			Notifys(Lang.Heroin.novial, "error")
-		end
+		if not GetRecipe(src, 'heroin', 'fillvial', 'tier1') then return end
+		Log(GetName(src) ..' Made A Vial Of Heroin', 'heroin')
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:failheatingheroin', function()
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
+local Player = getPlayer(src)
 local cuth = Player.Functions.GetItemByName('heroincut')
 local cuth2 = Player.Functions.GetItemByName('heroincutstagetwo')
 local cuth3 = Player.Functions.GetItemByName('heroincutstagethree')
-Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Sucks And Burned Their Heroin', 'heroin')
+Log(GetName(src) ..' Sucks And Burned Their Heroin', 'heroin')
 	if cuth then
-		RemoveItem('heroincut', 1) 
-		Notifys(Lang.Heroin.fail, "error")
+		RemoveItem(src, 'heroincut', 1) 
+		Notifys(src,Lang.Heroin.fail, "error")
 	elseif cuth2 then
-		RemoveItem('heroincutstagetwo', 1) 
-		Notifys(Lang.Heroin.fail, "error")
+		RemoveItem(src, 'heroincutstagetwo', 1) 
+		Notifys(src,Lang.Heroin.fail, "error")
 	elseif cuth3 then
-		RemoveItem('heroincutstagethree', 1)
-		Notifys(Lang.Heroin.fail, "error")
+		RemoveItem(src, 'heroincutstagethree', 1)
+		Notifys(src,Lang.Heroin.fail, "error")
 	end
 end)
 
 
 RegisterServerEvent('md-drugs:server:fillneedle', function(num)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.fillneedle[num]['loc']) then return end
-	if not Itemcheck(Player, 'needle', 1, 'true') then return end
+    local Player = getPlayer(src)
+	if CheckDist(source, Config.fillneedle[num]['loc']) then return end
+	if not Itemcheck(src, 'needle', 1) then return end
 	if Config.TierSystem then
-		local heroin = Player.PlayerData.metadata['heroin']
+		local heroin = getRep(src, 'heroin')
 		local vh = Player.Functions.GetItemByName('heroinvial')
 		local vh2 = Player.Functions.GetItemByName('heroinvialstagetwo')
 		local vh3 = Player.Functions.GetItemByName('heroinvialstagethree')
 		if vh then
-			RemoveItem('heroinvial', 1 ) 
-			RemoveItem('needle', 1) 
-			AddItem('heroin_ready', 1) 
-			Player.Functions.SetMetaData('heroin',  (heroin + 1))
-			Notifys(Lang.Heroin.fill, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Filled A Needle Of Heroin And Now Has A Rep Of ' .. heroin + 1 .. '!' , 'heroin')
+			if not GetRecipe(src, 'heroin', 'fillneedle', 'tier1') then return end
+			AddRep(src, 'heroin')
+			Log(GetName(src) ..' Filled A Needle Of Heroin And Now Has A Rep Of ' .. heroin + 1 .. '!' , 'heroin')
 		elseif vh2 then
-			RemoveItem('heroinvialstagetwo', 1 ) 
-			RemoveItem('needle', 1) 
-			AddItem('heroin_readystagetwo', 1) 
-			Player.Functions.SetMetaData('heroin',  (heroin + 1))
-			Notifys(Lang.Heroin.fill, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Filled A Needle Of Heroin Tier 2 And Now Has A Rep Of ' .. heroin + 1 .. '!' , 'heroin')
+			if not GetRecipe(src, 'heroin', 'fillneedle', 'tier2') then return end
+			AddRep(src, 'heroin')
+			Log(GetName(src) ..' Filled A Needle Of Heroin Tier 2 And Now Has A Rep Of ' .. heroin + 1 .. '!' , 'heroin')
 		elseif vh3 then
-			RemoveItem('heroinvialstagethree', 1 ) 
-			RemoveItem('needle', 1) 
-			AddItem('heroin_readystagethree', 1) 
-			Player.Functions.SetMetaData('heroin',  (heroin + 1))
-			Notifys(Lang.Heroin.fill, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Filled A Needle Of Heroin Tier 3 And Now Has A Rep Of ' .. heroin + 1  .. '!' , 'heroin')
+			if not GetRecipe(src, 'heroin', 'fillneedle', 'tier3') then return end
+			AddRep(src, 'heroin')
+			Log(GetName(src) ..' Filled A Needle Of Heroin Tier 3 And Now Has A Rep Of ' .. heroin + 1  .. '!' , 'heroin')
 		else
-			Notifys(Lang.Heroin.nofill, "error")
+			Notifys(src,Lang.Heroin.nofill, "error")
 		end
 	else
-		if RemoveItem('heroinvial', 1 ) then
-		 	RemoveItem('needle', 1)
-			AddItem('heroin_ready', 1)
-			Notifys(Lang.Heroin.fill, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Filled A Needle Of Heroin!' , 'heroin')
-		else
-			Notifys(Lang.Heroin.nofill, "error")
-		end
+		if not GetRecipe(src, 'heroin', 'fillneedle', 'tier1') then return end
+		Log(GetName(src) ..' Filled A Needle Of Heroin!' , 'heroin')
 	end
 end)
 
@@ -275,18 +207,18 @@ end)
 
 RegisterServerEvent('md-drugs:server:failheroin', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Sucks And Burned Their Heroin', 'heroin')
+    local Player = getPlayer(src)
+	Log(GetName(src) ..' Sucks And Burned Their Heroin', 'heroin')
 	if Config.TierSystem then
 		local vh = Player.Functions.GetItemByName('heroinvial')
 		local vh2 = Player.Functions.GetItemByName('heroinvialstagetwo')
 		local vh3 = Player.Functions.GetItemByName('heroinvialstagethree')
-		if vh then RemoveItem('heroinvialstagethree', 1 ) 
-		elseif vh2 then RemoveItem('heroinvialstagetwo', 1) 
-		elseif vh3 then RemoveItem('heroinvial', 1)
+		if vh then RemoveItem(src, 'heroinvialstagethree', 1 ) 
+		elseif vh2 then RemoveItem(src, 'heroinvialstagetwo', 1) 
+		elseif vh3 then RemoveItem(src, 'heroinvial', 1)
 		end
 	else
-		RemoveItem('heroinvial', 1)
+		RemoveItem(src, 'heroinvial', 1)
 	end
 end)
 

server/lean.lua

@@ -1,43 +1,27 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
 RegisterServerEvent('md-drugs:server:givelean', function()
-	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
 	local chance = math.random(1,100)
 	local amount = math.random(1,5)
 	if chance <= 50 then 
-		if AddItem('mdlean', amount) then
+		if AddItem(source, 'mdlean', amount) then
 			Notifys(Lang.Lean.lean, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. amount .. ' Of Lean' , 'lean')
+			Log(GetName(source) .. ' Got ' .. amount .. ' Of Lean' , 'lean')
 		end
 	else
-		if AddItem('mdreddextro', amount) then
+		if AddItem(source, 'mdreddextro', amount) then
 			Notifys(Lang.Lean.dextro, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. amount .. ' Of Red Dextro' , 'lean')
+			Log(GetName(source) .. ' Got ' .. amount .. ' Of Red Dextro' , 'lean')
 		end
 	end	
 end)
-local lean = {'mdlean', 'mdreddextro'}
-for k, v in pairs (lean) do 
-QBCore.Functions.CreateUseableItem(v, function(source)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-	if v == 'mdlean' then
-		if Player.Functions.GetItemByName('leancup') and Player.Functions.GetItemByName('sprunk') and Player.Functions.GetItemByName('mdlean') then 
-			Player.Functions.RemoveItem('mdlean', 1 )
-			Player.Functions.RemoveItem('sprunk', 1 )
-			Player.Functions.RemoveItem('leancup', 1 )
-			Player.Functions.AddItem('cupoflean', 1 )
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Cup Of Lean' , 'lean')
-		end
-	else
-		if Player.Functions.GetItemByName('leancup') and Player.Functions.GetItemByName('sprunk') and Player.Functions.GetItemByName('mdreddextro') then 
-			Player.Functions.RemoveItem('mdreddextro', 1 )
-			Player.Functions.RemoveItem('sprunk', 1 )
-			Player.Functions.RemoveItem('leancup', 1 )
-			Player.Functions.AddItem('cupofdextro', 1 )
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Cup Of Red Dextro' , 'lean')
-		end
+
+QBCore.Functions.CreateUseableItem('leancup', function(source, item)
+	if Itemcheck(source, 'leancup', 1) then 
+		TriggerClientEvent('md-drugs:client:leancraft', source)
 	end
 end)
-end
+
+RegisterServerEvent('md-drugs:server:finishcup', function(data)
+	if not GetRecipe(source, 'lean','cups', data.item) then return end
+end)

server/lsd.lua

@@ -1,155 +1,114 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
 RegisterServerEvent('md-drugs:server:getlysergic', function(num)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.lysergicacid[num]['loc']) then return end
-	if AddItem('lysergic_acid', 2) then
-		Notifys(Lang.lsd.lys, "success")
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got Lysergic acid with a distance of ' .. dist(source, playerPed, Config.lysergicacid[num]['loc']) .. '!', 'lsd')
+	local src = source
+	if CheckDist(src, Config.lysergicacid[num]['loc']) then return end
+	if AddItem(src,'lysergic_acid', 2) then
+		Log(GetName(src) ..' Got Lysergic acid with a distance of ' .. dist(source, Config.lysergicacid[num]['loc']) .. '!', 'lsd')
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:getdiethylamide', function(num)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.diethylamide[num]['loc']) then return end
-	if AddItem('diethylamide', 2) then 
-		Notifys(Lang.lsd.die, "success")
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got Diethylamide with a distance of ' .. dist(source, playerPed, Config.diethylamide[num]['loc']) .. '!', 'lsd')
+	local src = source
+	if CheckDist(src, Config.diethylamide[num]['loc']) then return end
+	if AddItem(src,'diethylamide', 2) then 
+		Log(GetName(src) ..' Got Diethylamide with a distance of ' .. dist(source, Config.diethylamide[num]['loc']) .. '!', 'lsd')
 	end
 end)
 
 
 QBCore.Functions.CreateUseableItem('lsdlabkit', function(source, item)
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(src)
 	if TriggerClientEvent("md-drugs:client:setlsdlabkit", src) then
-		Player.Functions.RemoveItem("lsdlabkit", 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Placed Their LSD Lab Kit Back At ' .. GetEntityCoords(playerPed) .. '!', 'lsd')
+		RemoveItem(src, "lsdlabkit", 1)
+		Log(GetName(src) ..' Placed Their LSD Lab Kit Back At ' .. GetCoords(src)  .. '!', 'lsd')
 	end
-end)	
+end)
 
 
-RegisterServerEvent('md-drugs:server:removecleaningkit', function(data)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)	
-	if not Itemcheck(Player, 'cleaningkit', 1, 'true') then return end
-	if RemoveItem("cleaningkit", 1) then 
-		Notifys(Lang.lsd.cleaned, "success")
-		TriggerClientEvent("md-drugs:client:resetlsdkit", src, data)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Wiped Down Their LSD Lab Kit!' , 'lsd')
+lib.callback.register('md-drugs:server:removecleaningkit', function(source)
+	local src = source
+	if not Itemcheck(src, 'cleaningkit', 1) then return end
+	if RemoveItem(src,"cleaningkit", 1) then 
+		Log(GetName(src) ..' Wiped Down Their LSD Lab Kit!' , 'lsd')
+		return true
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:getlabkitback', function()
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(src)
-	if AddItem("lsdlabkit", 1) then
-		Notifys('You Got Your Lab Kit Back', 'success')
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Up Their LSD Lab Kit Back At ' .. GetEntityCoords(playerPed) .. '!', 'lsd')
+	local src = source
+	if AddItem(src,"lsdlabkit", 1) then
+		Log(GetName(src) ..' Picked Up Their LSD Lab Kit Back At ' .. GetCoords(src) .. '!', 'lsd')
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:heatliquid', function()
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-	if not Itemcheck(Player, 'lysergic_acid', 1, 'true') then return end
-	if not Itemcheck(Player, 'diethylamide', 1, 'true') then return end
-		RemoveItem('diethylamide', 1)  
-		RemoveItem('lysergic_acid', 1)  
-		AddItem('lsd_one_vial', 1)
-		Notifys(Lang.lsd.madelsd, "success")
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Heated Basic LSD!', 'lsd')
-	
+	local src = source
+	if not GetRecipe(src, 'lsd', 'vial', 'heat') then return end
+	Log(GetName(src) ..' Heated Basic LSD!', 'lsd')
 end)
 
 RegisterServerEvent('md-drugs:server:failheating', function()
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-
-	RemoveItem('diethylamide', 1)  
-	RemoveItem('lysergic_acid', 1)  
-	Notifys(Lang.lsd.failed, "error")
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Failed Basic LSD Like An Idiot!', 'lsd')
+	local src = source
+	if not ChecknRemove(source, {lysergic_acid = 1, diethylamide = 1}) then return end
+	Notifys(src,Lang.lsd.failed, "error")
+	Log(GetName(src) ..' Failed Basic LSD Like An Idiot!', 'lsd')
 end)
 
 
 RegisterServerEvent('md-drugs:server:refinequalityacid', function()
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local randomchance = math.random(1,100)
-if not Itemcheck(Player, 'lsd_one_vial', 1, 'true') then return end
+if not Itemcheck(src, 'lsd_one_vial', 1) then return end
 	if Config.TierSystem then
-		local lsd = Player.PlayerData.metadata['lsd']
-		if RemoveItem('lsd_one_vial', 1) then 
+		local lsd = getRep(src, 'lsd')
+		if RemoveItem(src, 'lsd_one_vial', 1) then 
 			if lsd <= 30 then 
-				AddItem('lsd_vial_two', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_two', 1)
 			elseif lsd >= 31 and lsd <= 60 then 
-				AddItem('lsd_vial_three', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_three', 1)
 			elseif lsd >= 61 and lsd <= 90 then
-				AddItem('lsd_vial_four', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_four', 1)
 			elseif lsd >= 91 and lsd <= 120 then
-				AddItem('lsd_vial_five', 1)	
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_five', 1)	
 			else 
-				AddItem('lsd_vial_six', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_six', 1)
 			end
-			Player.Functions.SetMetaData('lsd', (lsd + 1))
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Refined Acid and Now Has A Rep Of ' .. lsd + 1 .. '!', 'lsd')
+			AddRep(src,'lsd')
+			Log(GetName(src) ..' Refined Acid and Now Has A Rep Of ' .. lsd + 1 .. '!', 'lsd')
 		end
 	else
-		if RemoveItem('lsd_one_vial', 1) then 
+		local randomchance = math.random(1,100)
+		if RemoveItem(src,'lsd_one_vial', 1) then 
 			if randomchance <= 60 then 
-				AddItem('lsd_vial_two', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_two', 1)
 			elseif randomchance >= 61 and randomchance <= 75 then 
-				AddItem('lsd_vial_three', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_three', 1)
 			elseif randomchance >= 76 and randomchance <= 85 then
-				AddItem('lsd_vial_four', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_four', 1)	
 			elseif randomchance >= 86 and randomchance <= 93 then
-				AddItem('lsd_vial_five', 1)	
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_five', 1)	
 			else 
-				AddItem('lsd_vial_six', 1)
-				Notifys(Lang.lsd.refined, "Success")
+				AddItem(src,'lsd_vial_six', 1)
 			end
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Refined Acid!', 'lsd')
+			Log(GetName(src) ..' Refined Acid!', 'lsd')
 		end
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:failrefinequality', function()
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local randomchance = math.random(1,100)
-if not Itemcheck(Player, 'lsd_one_vial', 1, 'true') then return end
-	if RemoveItem('lsd_one_vial', 1) then 
-		Player.Functions.SetMetaData('lsd', (Player.PlayerData.metadata.lsd - 1))
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Failed A Refinement And Now Has A Rep Of ' .. Player.PlayerData.metadata.lsd - 1 .. '!', 'lsd')
-		if Player.PlayerData.metadata.lsd < 0 then Player.Functions.SetMetaData('lsd', 0) end
-	end
+	local src = source
+	if not Itemcheck(src, 'lsd_one_vial', 1) then return end
+	RemoveItem(src,'lsd_one_vial', 1)  
 end)
 
 
 RegisterServerEvent('md-drugs:server:gettabpaper', function(num)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.gettabs[num]['loc']) then return end
+	local Player = getPlayer(src)
+	if CheckDist(source, Config.gettabs[num]['loc']) then return end
 	if Player.Functions.RemoveMoney('cash', Config.tabcost * 10) then
-		AddItem('tab_paper', 10)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bought Tab Paper!', 'lsd')
+		AddItem(src,'tab_paper', 10)
+		Log(GetName(src) ..' Bought Tab Paper!', 'lsd')
 	else
 		Notifys(Lang.lsd.broke, "error")
 	end
@@ -157,55 +116,51 @@ end)
  
 RegisterServerEvent('md-drugs:server:getlabkit', function()
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, vector3(Config.buylsdlabkit.x, Config.buylsdlabkit.y, Config.buylsdlabkit.z)) then return end
+	local Player = getPlayer(src)
+	if CheckDist(source, vector3(Config.buylsdlabkit.x, Config.buylsdlabkit.y, Config.buylsdlabkit.z)) then return end
 	if Player.Functions.RemoveMoney('cash', Config.lsdlabkitcost) then
-		AddItem('lsdlabkit', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bought A LSD Lab Kit!', 'lsd')
+		AddItem(src,'lsdlabkit', 1)
+		Log(GetName(src) ..' Bought A LSD Lab Kit!', 'lsd')
 	else
-		Notifys(Lang.lsd.broke, "error")
+		Notifys(src, Lang.lsd.broke, "error")
 	end
 end)
 
-
-
-
 RegisterServerEvent('md-drugs:server:maketabpaper', function()
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-	if not Itemcheck(Player, 'tab_paper', 1, 'true') then return end
-	if Player.Functions.RemoveItem('lsd_one_vial', 1) then
-		RemoveItem('tab_paper', 1)
-		AddItem('smileyfacesheet', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Smiley Face Sheet', 'lsd')
-	elseif Player.Functions.RemoveItem('lsd_vial_two', 1) then
-		RemoveItem('tab_paper', 1)
-		AddItem('wildcherrysheet', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Wild Cherry Sheet', 'lsd')
-	elseif Player.Functions.RemoveItem('lsd_vial_three', 1) then
-		RemoveItem('tab_paper', 1)
-		AddItem('yinyangsheet', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Yin Yang Sheet', 'lsd')
-	elseif Player.Functions.RemoveItem('lsd_vial_four', 1) then
-		RemoveItem('tab_paper', 1)
-		AddItem('pineapplesheet', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Pine Apple Sheet', 'lsd')
-	elseif Player.Functions.RemoveItem('lsd_vial_five', 1) then
-		RemoveItem('tab_paper', 1)
-		AddItem('bartsheet', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Cluckin Bell Sheet', 'lsd')
-	elseif Player.Functions.RemoveItem('lsd_vial_six', 1) then
-		RemoveItem('tab_paper', 1)
-		AddItem('gratefuldeadsheet', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Maze Sheet', 'lsd')
-	else
-		Notifys(Lang.lsd.novial, "error")
+	local src = source
+	local Player = getPlayer(src)
+	if not Itemcheck(src,'tab_paper', 1) then return end
+	local count = 0
+	local items, recieve = nil, nil
+	local vialdata = {
+		{vial = 'lsd_one_vial',   sheet = 'smileyfacesheet', log = 'Made A Smiley Face Sheet'},
+	    {vial = 'lsd_vial_two',   sheet = 'wildcherrysheet', log = 'Made A Wild Cherry Sheet'},
+	    {vial = 'lsd_vial_three', sheet = 'yinyangsheet', log = 'Made A Yin Yang Sheet'},
+	    {vial = 'lsd_vial_four',  sheet = 'pineapplesheet', log = 'Made A Pine Apple Sheet'},
+	    {vial = 'lsd_vial_five',  sheet = 'bartsheet', log = 'Made A Cluckin Bell Sheet'},
+	    {vial = 'lsd_vial_six',   sheet = 'gratefuldeadsheet', log = 'Made A Maze Sheet'}
+	}
+	sortTab(vialdata, 'vial')
+	for k, v in pairs (vialdata) do
+		if count >= 1 then break end
+		local check = Player.Functions.GetItemByName(v.vial)
+		
+		if check and check.amount >= 1 then
+			items = v.vial
+			recieve = v.sheet
+			Log(GetName(src) ..' ' .. v.log, 'lsd')
+			count = count + 1
+		end
+	end
+	if count >= 1 then
+		if RemoveItem(src, items, 1) and RemoveItem(src, 'tab_paper', 1) then
+			AddItem(src, recieve, 1)
+		end
 	end
 end)
 
 local sheets = {
-	{item = 'smileyfacesheet',   recieve = "Smiley_tabs", 		},
+	{item = 'smileyfacesheet',   recieve = "smiley_tabs", 		},
 	{item = 'wildcherrysheet',   recieve = "wildcherry_tabs",   },
 	{item = 'yinyangsheet',      recieve = "yinyang_tabs",      },
 	{item = 'pineapplesheet',    recieve = "pineapple_tabs",    },
@@ -216,12 +171,11 @@ local sheets = {
 for k, v in pairs (sheets) do 
 	QBCore.Functions.CreateUseableItem(v.item, function(source)
 		local src = source
-		local Player = QBCore.Functions.GetPlayer(src)
+		local Player = getPlayer(src)
 		local math = math.random(1,10)
-		if Player.Functions.RemoveItem(v.item, 1) then
-			Player.Functions.AddItem(v.recieve, math)
-			TriggerClientEvent("inventory:client:ItemBox", src, QBCore.Shared.Items[v.recieve], "add", math )
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made ' .. math .. 'Tabs of ' .. v.recieve .. '!', 'lsd')
+		if RemoveItem(src, v.item, 1) then
+			AddItem(src, v.recieve, math)
+			Log(GetName(src) ..' Made ' .. math .. 'Tabs of ' .. v.recieve .. '!', 'lsd')
 		end
 	end)
 end

server/mescaline.lua

@@ -1,14 +1,12 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 GlobalState.Mescaline = Config.Mescaline
 
-
 Citizen.CreateThread(function()
     for _, v in pairs(Config.Mescaline) do
         v.taken = false
     end
 end)
 
-
 function MescalineCooldown(loc)
     CreateThread(function()
         Wait(Config.respawnTime * 1000)
@@ -21,43 +19,28 @@ function MescalineCooldown(loc)
 end
 
 
-
-RegisterNetEvent("Mescaline:pickupCane")
-AddEventHandler("Mescaline:pickupCane", function(loc)
-    local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.Mescaline[loc].location) then end
+RegisterNetEvent("Mescaline:pickupCane", function(loc)
+	if CheckDist(source, Config.Mescaline[loc].location) then return end
     if not Config.Mescaline[loc].taken then
         Config.Mescaline[loc].taken = true
         GlobalState.Mescaline = Config.Mescaline
         TriggerClientEvent("Mescaline:removeCane", -1, loc)
         MescalineCooldown(loc)
-        local Player = QBCore.Functions.GetPlayer(source)
-        AddItem('cactusbulb', 1)
-        Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Cactus Bulbs With a distance of ' .. dist(source, playerPed, Config.Mescaline[loc].location) .. ' vectors', 'mescaline')
+        AddItem(source,'cactusbulb', 1)
+        Log(GetName(source) .. ' Picked Cactus Bulbs With a distance of ' .. dist(source, Config.Mescaline[loc].location) .. ' vectors', 'mescaline')
     end
 end)
 
-
-
-RegisterNetEvent("md-drugs:server:drymescaline")
-AddEventHandler("md-drugs:server:drymescaline", function()
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-
-    if RemoveItem("cactusbulb", 1) then
-		AddItem("driedmescaline", 1)
-        Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Dried Mescaline', 'mescaline')
-    else
-	    Notifys(Lang.mescaline.nocactus, "error")
-    end
+RegisterNetEvent("md-drugs:server:drymescaline", function()
+    local src = source
+    if not GetRecipe(src, 'mescaline', 'dry', 'dried') then return end
+    Log(GetName(source) .. ' Dried Mescaline', 'mescaline')
 end)
 
 QBCore.Functions.CreateUseableItem("driedmescaline", function(source, item)
     local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-
-    if Player.Functions.RemoveItem("driedmescaline", 1) then 
+    if RemoveItem(src, "driedmescaline", 1) then 
 	    TriggerClientEvent("md-drugs:client:takemescaline", src)
-        Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Consumed Mescaline', 'consume')
+        Log(GetName(source) .. ' Consumed Mescaline', 'consume')
     end
 end)

server/meth.lua

@@ -1,65 +1,47 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
 RegisterServerEvent('md-drugs:server:startcook', function()
-  local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
-	if not Itemcheck(Player, 'ephedrine', 1, 'true') and Itemcheck(Player, 'acetone', 1, 'true') then return end
-	Notifys("Adding Things To The Mix", "success")
-	RemoveItem('ephedrine', 1)
-	RemoveItem('acetone', 1)
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Started A Meth Batch', 'Meth')
+  	local src = source
+	if not GetRecipe(source, 'meth', 'cook', 'heat') then return end
+	Notifys(src, "Adding Things To The Mix", "success")
+	Log(GetName(source) .. ' Started A Meth Batch', 'Meth')
 end)
 
 RegisterServerEvent('md-drugs:server:givemethingridients', function()
-  local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local src = source
 	local chance = math.random(1,100)
 	local amount = math.random(1,5)
 	if chance <= 50 then 
-		if AddItem('ephedrine', amount) then
-			Notifys(Lang.meth.eph, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. amount .. ' Of Ephedrine', 'Meth')
+		if AddItem(src,'ephedrine', amount) then
+			Log(GetName(src) .. ' Got ' .. amount .. ' Of Ephedrine', 'Meth')
 		end
 	else
-		if AddItem('acetone', amount) then
-			Notifys(Lang.meth.ace, "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. amount .. ' Of Acetone', 'Meth')
+		if AddItem(src, 'acetone', amount) then
+			Log(GetName(src) .. ' Got ' .. amount .. ' Of Acetone', 'Meth')
 		end
 	end	
 end)
 
 RegisterServerEvent('md-drugs:server:getmeth', function()
-  local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
-  local amount = math.random(1,5)
- 
-  if RemoveItem("empty_weed_bag", amount) then
-		AddItem("methbags", amount)
-		Notifys("You Made " .. amount .. " Bags Of Meth!", "success")
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bagged ' .. amount .. 'Of Meth', 'Meth')
-	else
-		Notifys(Lang.meth.nobag, "error")
-	end
+  	local src = source
+	if not GetRecipe(src, 'meth', 'bag', 'bags') then return end
+	Log(GetName(src) .. ' Bagged 5 Of Meth', 'Meth')
 end)
 
 RegisterServerEvent('md-drugs:server:geteph', function(num)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-		if CheckDist(source, playerPed, Config.MethEph[num]['loc']) then return end
-		if AddItem('ephedrine', 1) then
-			Notifys('Got Ephedrine!', "success")
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. 1 .. 'Of Ephedrine', 'Meth')
-		end
+	if CheckDist(src, Config.MethEph[num]['loc']) then return end
+	if AddItem(src, 'ephedrine', 1) then
+		Notifys(src, 'Got Ephedrine!', "success")
+		Log(GetName(src) .. ' Got ' .. 1 .. 'Of Ephedrine', 'Meth')
+	end
 end)
 	
 RegisterServerEvent('md-drugs:server:getace', function(num)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-		if CheckDist(source, playerPed, Config.Methace[num]['loc']) then return end
-		if AddItem('acetone', 1) then
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. 1 .. 'Of Acetone', 'Meth')
-			Notifys('Got Acetone!', "success")
-		end
+	if CheckDist(src, Config.Methace[num]['loc']) then return end
+	if AddItem(src, 'acetone', 1) then
+		Log(GetName(src) .. ' Got ' .. 1 .. 'Of Acetone', 'Meth')
+		Notifys(src, 'Got Acetone!', "success")
+	end
 end)

server/oxyruns.lua

@@ -1,40 +1,40 @@
 QBCore = exports['qb-core']:GetCoreObject()
 
-RegisterServerEvent('md-drugs:server:payfortruck', function()
+lib.callback.register('md-drugs:server:payfortruck', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
+    local Player = getPlayer(src)
 	if Player.Functions.RemoveMoney('cash', Config.TruckPrice ) or Player.Functions.RemoveMoney('bank', Config.TruckPrice ) then
-		TriggerClientEvent("md-drugs:Client:getoxylocation", src)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Rented A Van For OxyRuns', 'oxy')
+		Log(GetName(src) .. ' Rented A Van For OxyRuns', 'oxy')
+		return true
 	else
-		Notifys(Lang.oxy.broke, "error")
+		Notifys(src, Lang.oxy.broke, "error")
+		return false
 	end
 end)
 
 
 RegisterServerEvent('md-drugs:server:giveoxybox', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 	local chance = math.random(1,100)
 	local cash = Config.OxyRunCompleteCash
 	local itemchance = math.random(1,100)
 	local item = Config.OxyRandItems[math.random(1, #Config.OxyRandItems)]
 	
 	if chance <= Config.OxyRunDitchChance then 
-		Notifys(Lang.oxy.hot, "error")
+		Notifys(src, Lang.oxy.hot, "error")
 		Player.Functions.AddMoney("cash", cash * 0.5)
 		if itemchance <= Config.OxyItemChance then 
-			AddItem(item, Config.OxyItemAmount)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. Config.OxyItemAmount .. ' Of ' .. item .. ' For This Drop Off', 'oxy')
+			AddItem(src, item, Config.OxyItemAmount)
+			Log(GetName(source) .. ' Got ' .. Config.OxyItemAmount .. ' Of ' .. item .. ' For This Drop Off', 'oxy')
 		end	
 	else
 		Notifys(Lang.oxy.next, "success")
 		TriggerClientEvent("md-drugs:client:getoxylocationroute", src)
 		Player.Functions.AddMoney("cash", cash)
 		if itemchance <= Config.OxyItemChance then 
-			AddItem(item, Config.OxyItemAmount)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Got ' .. Config.OxyItemAmount .. ' Of ' .. item .. ' For This Drop Off', 'oxy')
+			AddItem(src, item, Config.OxyItemAmount)
+			Log(GetName(source) .. ' Got ' .. Config.OxyItemAmount .. ' Of ' .. item .. ' For This Drop Off', 'oxy')
 		end
 	end
 	

server/pharma.lua

@@ -1,82 +1,73 @@
 local QBCore = exports['qb-core']:GetCoreObject()
 
+local function GetJob(source) 
+	local src = source
+	local Player = getPlayer(src) 
+	if Player.PlayerData.job.type == 'ems' then
+		return true
+	else
+		return false
+	end
+end
+
 QBCore.Functions.CreateUseableItem('prescription_pad', function(source, item)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	if Player.PlayerData.job.type == 'ems' then 
+	if GetJob(src) then 
 		TriggerClientEvent("md-drugs:client:prescriptionpad", src, item)
 	end	
 end)
 
 RegisterServerEvent('md-drugs:server:giveprescription', function(item)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	Player.Functions.AddItem(item, 1)
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Prescription Of ' .. item .. '!', 'pharma')
-	TriggerClientEvent("inventory:client:ItemBox", source, QBCore.Shared.Items[item], "add", 1)
+	if GetJob(src) then
+		AddItem(src, item, 1)
+		Log(GetName(src) .. ' Made A Prescription Of ' .. item .. '!', 'pharma')
+	end
 end)
 
 RegisterServerEvent('md-drugs:server:unbottle', function(item)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
 	local amount = math.random(10,30)
-	Player.Functions.AddItem(item, amount)
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Unbottled '.. amount .. ' Of ' .. item .. '!', 'pharma')
-	TriggerClientEvent("inventory:client:ItemBox", source, QBCore.Shared.Items[item], "add", amount)
+	AddItem(src, item, amount)
+	Log(GetName(src) .. ' Unbottled '.. amount .. ' Of ' .. item .. '!', 'pharma')
 end)
 
 local pharmabottle = {'vicodinbottle', 'adderalbottle','morphinebottle','xanaxbottle'}
 for m, d in pairs (pharmabottle) do
 QBCore.Functions.CreateUseableItem(d, function(source, item)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
-	if Player.Functions.RemoveItem(d, 1) then
+	if RemoveItem(src, d, 1) then
 		TriggerClientEvent("md-drugs:client:unbottle", src, item)
-		TriggerClientEvent("inventory:client:ItemBox", source, QBCore.Shared.Items[d], "remove", 1)
 	end	
 end)
 end
 
-local pharmadrugs = { "adderal", "vicodin", "xanax", "morphine"}
-for k, v in pairs (pharmadrugs) do QBCore.Functions.CreateUseableItem(v, function(source, item)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
 
-if TriggerClientEvent('md-drugs:client:takepharma', src, item.name) then
-	Player.Functions.RemoveItem(item.name, 1)
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Took ' .. item.name .. '!', 'pharma')
-	TriggerClientEvent("inventory:client:ItemBox", source, QBCore.Shared.Items[item.name], "remove", 1)
-	
-	end
-end)
-end
 RegisterServerEvent('md-drugs:server:fillprescription', function()
 	local src = source
-    	local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 	local vic = Player.Functions.GetItemByName('vicodin_prescription')
 	local add = Player.Functions.GetItemByName('adderal_prescription')
 	local mor = Player.Functions.GetItemByName('morphine_prescription')
 	local xan = Player.Functions.GetItemByName('xanax_prescription')	
 	if vic then
-		RemoveItem('vicodin_prescription', 1 ) 
-		AddItem('vicodinbottle', 1) 
-		Notifys(Lang.Pharma.pills, "success")
+		RemoveItem(src,'vicodin_prescription', 1 ) 
+		AddItem(src,'vicodinbottle', 1) 
+		Notifys(src,Lang.Pharma.pills, "success")
 	elseif add then
-		RemoveItem('adderal_prescription', 1 ) 
-		AddItem('adderalbottle', 1) 
-		Notifys(Lang.Pharma.pills, "success")
+		RemoveItem(src,'adderal_prescription', 1 ) 
+		AddItem(src,'adderalbottle', 1) 
+		Notifys(src,Lang.Pharma.pills, "success")
 	elseif mor then
-		RemoveItem('morphine_prescription', 1 ) 
-		AddItem('morphinebottle', 1) 
-		Notifys(Lang.Pharma.pills, "success")
-		
+		RemoveItem(src,'morphine_prescription', 1 ) 
+		AddItem(src,'morphinebottle', 1) 
+		Notifys(src,Lang.Pharma.pills, "success")	
 	elseif xan then
-		RemoveItem('xanax_prescription', 1 ) 
-		AddItem('xanaxbottle', 1) 
-		Notifys(Lang.Pharma.pills, "success")
-		
+		RemoveItem(src,'xanax_prescription', 1 ) 
+		AddItem(src,'xanaxbottle', 1) 
+		Notifys(src,Lang.Pharma.pills, "success")	
 	else
-		Notifys(Lang.Pharma.no, "error")
+		Notifys(src,Lang.Pharma.no, "error")
 	end
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Filled A Prescription!', 'pharma')
+	Log(GetName(src) .. ' Filled A Prescription!', 'pharma')
 end)

server/recipes.lua

@@ -0,0 +1,169 @@
+local QBCore = exports['qb-core']:GetCoreObject()
+
+local recipe = {
+    cocaine = {
+       cokepowder = {
+            tier1 = {take = {coca_leaf = 1}, give = {coke = 1}},
+            tier2 = {take = {coca_leaf = 1}, give = {cokestagetwo = 1}},
+            tier3 = {take = {coca_leaf = 1}, give = {cokestagethree = 1}},
+       },
+       cutcoke = {
+            tier1 = {take = {coke = 1,           bakingsoda = 1}, give = {loosecoke = 1}},
+            tier2 = {take = {cokestagetwo = 1,   bakingsoda = 1}, give = {loosecokestagetwo = 1}},
+            tier3 = {take = {cokestagethree = 1, bakingsoda = 1}, give = {loosecokestagethree = 1}},
+       },
+       bagcoke = {
+            tier1 = {take = {loosecoke = 1,             empty_weed_bag = 1}, give = {cokebaggy = 1}},
+            tier2 = {take = {loosecokestagetwo = 1,     empty_weed_bag = 1}, give = {cokebaggystagetwo = 1}},
+            tier3 = {take = {loosecokestagethree = 1,   empty_weed_bag = 1}, give = {cokebaggystagethree = 1}},
+       }
+    },
+    crack = {
+        cookcrack = {
+             tier1 = {take = {loosecoke = 1,          bakingsoda = 1}, give = {crackrock = 1}},
+             tier2 = {take = {loosecokestagetwo = 1,  bakingsoda = 1}, give = {crackrockstagetwo = 1}},
+             tier3 = {take = {loosecokestagethree = 1,bakingsoda = 1}, give = {crackrockstagethree = 1}},
+        },
+        bagcrack = {
+             tier1 = {take = {crackrock = 1,           empty_weed_bag = 1}, give = {baggedcracked = 1}},
+             tier2 = {take = {crackrockstagetwo = 1,   empty_weed_bag = 1}, give = {baggedcrackedstagetwo = 1}},
+             tier3 = {take = {crackrockstagethree = 1, empty_weed_bag = 1}, give = {baggedcrackedstagethree = 1}},
+        }
+     },
+     heroin = {
+        dryheroin = {
+            tier1 = {take = {poppyresin = 1}, give = {heroin = 1}},
+            tier2 = {take = {poppyresin = 1}, give = {heroinstagetwo = 1}},
+            tier3 = {take = {poppyresin = 1}, give = {heroinstagethree = 1}},
+        },
+        cutheroin = {
+            tier1 = {take = {heroin = 1,            bakingsoda = 1}, give = {heroincut = 1}},
+            tier2 = {take = {heroinstagetwo = 1,    bakingsoda = 1}, give = {heroincutstagetwo = 1}},
+            tier3 = {take = {heroinstagethree = 1,  bakingsoda = 1}, give = {heroincutstagethree = 1}},
+        },
+        fillvial = {
+            tier1 = {take = {heroincut = 1,            emptyvial = 1}, give = {heroinvial = 1}},
+            tier2 = {take = {heroincutstagetwo = 1,    emptyvial = 1}, give = {heroinvialstagetwo = 1}},
+            tier3 = {take = {heroincutstagethree = 1,  emptyvial = 1}, give = {heroinvialstagethree = 1}},
+        },
+        fillneedle = {
+            tier1 = {take = {heroinvial = 1,            needle = 1}, give = {heroin_ready = 1}},
+            tier2 = {take = {heroin_readystagetwo = 1,  needle = 1}, give = {heroin_readystagetwo = 1}},
+            tier3 = {take = {heroinvialstagethree = 1,  needle = 1}, give = {heroin_readystagethree = 1}},
+        }
+     },
+     lsd = {
+        vial = {
+            heat = {take = {lysergic_acid = 1, diethylamide = 1,}, give = {lsd_one_vial = 1}}
+        },
+        
+     },
+    mescaline = {
+        dry = {
+            dried = {take = {cactusbulb = 1}, give = {driedmescaline = 1} }
+        }
+    },
+    lean = {
+        cups = {
+            cupoflean = {take = {leancup = 1, sprunk = 1, mdlean = 1}, give = {cupoflean = 1}},
+            cupofdextro = {take = {leancup = 1, sprunk = 1, mdreddextro = 1}, give = {cupofdextro = 1}},
+        }
+    },
+    meth = {
+        cook = {
+            heat = {take = {ephedrine = 1, acetone = 1}, give = {}}
+        },
+        bag = {
+            bags = {take = {empty_weed_bag = 5}, give = {methbags = 5} }
+        }
+    },
+    weed = {
+        edibles = {
+            cannabutter =       {take = {   mdbutter = 1,       grindedweed = 1},           give = {cannabutter = 1}},
+            specialbrownie =     {take = {   cannabutter = 1, 	flour = 1, 	chocolate = 1}, give = {specialbrownie = 1}},
+            specialcookie =     { take = {  cannabutter = 1, 	flour = 1},                 give = {specialcookie = 1}},
+            specialchocolate =  { take = { 	cannabutter = 1, 	chocolate = 1},             give = {specialchocolate = 1}},
+            specialmuffin =     { take = { 	cannabutter = 1, 	flour = 1},                 give = {specialmuffin = 1}},
+        },
+        oil = {
+            shatter = {take = {butane = 1, grindedweed = 1}, give = {shatter = 1}}
+        },
+        blunts = {
+            blunt = {take = {bluntwrap = 1, grindedweed = 1}, give = {blunt = 1}},
+            chewyblunt = {take = {bluntwrap = 1, grindedweed = 1, loosecoke = 1}, give = {chewyblunt = 1}},
+            leanblunts = {take = {leanbluntwrap = 1, grindedweed = 1}, give = {leanblunts = 1}},
+            dextroblunts = {take = {dextrobluntwrap = 1, grindedweed = 1}, give = {dextroblunts = 1}}
+        },
+        bluntwrap = {
+            leanbluntwrap = {take = {bluntwrap = 5, mdlean = 1}, give = {leanbluntwrap = 5}},
+            dextrobluntwrap = {take = {bluntwrap = 5, mdreddextro = 1}, give = {dextrobluntwrap = 5}},
+        }
+    },
+    xtc = {
+        raw = {
+            raw_xtc = {take = {mdp2p = 1, isosafrole = 1}, give = {raw_xtc = 1}}
+        },
+        singlestack = {
+            white =  {take = {raw_xtc = 1}, give = {white_xtc = 1}},
+            red =    {take = {raw_xtc = 1, loosecoke = 1 }, give = {red_xtc = 1}},
+            orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc = 1}},
+            blue =   {take = {raw_xtc = 1, crackrock = 1 }, give = {blue_xtc = 1}},
+        },
+        dualstack = {
+            white = {take = {raw_xtc = 1}, give = {white_xtc2 = 1}},
+            red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc2 = 1}},
+            orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc2 = 1}},
+            blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc2 = 1}},
+        },
+        triplestack = {
+            white = {take = {raw_xtc = 1}, give = {white_xtc3 = 1}},
+            red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc3 = 1}},
+            orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc3 = 1}},
+            blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc3 = 1}},
+        },
+        quadstack = {
+            white = {take = {raw_xtc = 1}, give = {white_xtc4 = 1}},
+            red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc4 = 1}},
+            orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc4 = 1}},
+            blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc4 = 1}},
+        },
+        press = {
+            dual = {take = {white_xtc = 20, blue_xtc = 20, red_xtc = 20, orange_xtc = 20, singlepress = 1}, give = {dualpress = 1}},
+            triple = {take = {white_xtc2 = 50, blue_xtc2 = 50, red_xtc2 = 50, orange_xtc2 = 50, dualpress = 1}, give = {triplepres = 1}},
+            quad = { take = {white_xtc3 = 50, blue_xtc3 = 50, red_xtc3 = 50, orange_xtc3 = 50, triplepress = 1}, give = {quadpress = 1}}
+        }
+    }
+}
+
+function GetRecipe(source, type, method, tier)
+    local src = source
+    local Player = getPlayer(source) 
+    local has = 0
+    local need = 0 
+        for k, v in pairs (recipe[type][method][tier].take) do 
+            local item = Player.Functions.GetItemByName(k) 
+            if item and item.amount >= v then 
+                has = has + 1
+            else
+                Notifys(src, ' You Need ' .. v .. ' Of '  .. GetLabels(k) .. ' To Do This', 'error')
+            end
+            need = need + 1
+        end
+        if has == need then 
+            for k, v in pairs (recipe[type][method][tier].take) do
+                RemoveItem(src, k, v) 
+            end
+            for k,v in pairs (recipe[type][method][tier].give) do
+                AddItem(src, k, v) 
+            end
+    
+            return true
+        else
+            return false
+        end
+    end 
+    
+lib.callback.register('md-drugs:server:GetRecipe', function(source, type, cat)
+if not source then return false end
+return recipe[type][cat]
+end)

server/shrooms.lua

@@ -20,31 +20,24 @@ function shroomsCooldown(loc)
     end)
 end
 
-
-RegisterNetEvent("shrooms:pickupCane")
-AddEventHandler("shrooms:pickupCane", function(loc)
-    local chance = math.random(1,10)
-    local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.shrooms[loc].location) then return end
+RegisterNetEvent("shrooms:pickupCane", function(loc)
+	if CheckDist(source, Config.shrooms[loc].location) then return end
     if not Config.shrooms[loc].taken then
         Config.shrooms[loc].taken = true
         GlobalState.shrooms = Config.shrooms
         TriggerClientEvent("shrooms:removeCane", -1, loc)
         shroomsCooldown(loc)
-        local Player = QBCore.Functions.GetPlayer(source)
-        AddItem('shrooms', 1)
-        Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked A Shroom With a distance of ' .. dist(source, playerPed, Config.shrooms[loc].location) .. ' vectors', 'shrooms')
+        AddItem(source, 'shrooms', 1)
+        Log(GetName(source) .. ' Picked A Shroom With a distance of ' .. dist(source, Config.shrooms[loc].location) .. ' vectors', 'shrooms')
     end
 end)
 
 QBCore.Functions.CreateUseableItem('shrooms', function(source, item)
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-
 if TriggerClientEvent('md-drugs:client:takeshrooms', src, item.name) then
-	Player.Functions.RemoveItem('shrooms', 1)
-    Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Took Some Mushrooms', 'shrooms')
-    TriggerClientEvent("QBCore:Notify", src, Lang.Shrooms.trip, 'success')
+	RemoveItem(src, 'shrooms', 1)
+    Log(GetName(source) .. ' Took Some Mushrooms', 'shrooms')
+    Notifys(src, 'You Took Some Shrooms!', 'success')
 	end
 end)
 

server/travellingmerchant.lua

@@ -1,13 +1,84 @@
 local QBCore = exports['qb-core']:GetCoreObject()
+local loc = math.random(1, #Config.Travellingmerchant)
+local stores = {
+	travel = {
+		{name = "tab_paper", 	   price = 50, 	amount = 50,	},
+		{name = "bakingsoda", 	   price = 25, 	amount = 50, 	},
+		{name = "isosafrole", 	   price = 25, 	amount = 50, 	},
+		{name = "mdp2p", 		   price = 25, 	amount = 50, 	},
+		{name = "lysergic_acid",   price = 25, 	amount = 50, 	},
+		{name = "diethylamide",    price = 25, 	amount = 50, 	},
+		{name = "lockpick",  	   price = 2, 	amount = 1000, 	},
+		{name = "emptyvial", 	   price = 2, 	amount = 1000, 	},
+		{name = "needle", 		   price = 2, 	amount = 1000,	},
+		{name = "cokeburner", 	   price = 25, 	amount = 50, 	},
+		{name = "crackburner", 	   price = 2, 	amount = 50, 	},
+		{name = "lsdburner",	   price = 2, 	amount = 50, 	},
+		{name = "heroinburner",    price = 2, 	amount = 50, 	},
+		{name = "mdlean", 		   price = 50, 	amount = 50, 	},
+		{name = "weedgrinder", 	   price = 25, 	amount = 50, 	},
+		{name = "mdbutter", 	   price = 25, 	amount = 50, 	},
+		{name = "flour", 		   price = 25, 	amount = 50, 	},
+		{name = "chocolate",  	   price = 25, 	amount = 50, 	},
+		{name = "butane", 		   price = 25, 	amount = 50, 	},
+		{name = "butanetorch", 	   price = 2, 	amount = 1000, 	},
+		{name = "dabrig", 		   price = 2, 	amount = 1000, 	},
+		{name = "mdwoods", 		   price = 2, 	amount = 1000, 	},
+		{name = "leancup", 		   price = 25, 	amount = 50, 	},
+		{name = "xtcburner", 	   price = 25, 	amount = 50, 	},
+	},
+	Weed = {
+		{name = "weedgrinder", 	price = 25, 	amount = 50, },
+		{name = "mdbutter", 	price = 25, 	amount = 50, },
+		{name = "flour", 		price = 25, 	amount = 50, },
+		{name = "chocolate",  	price = 25, 	amount = 50, },
+		{name = "butane", 		price = 25, 	amount = 50, },
+		{name = "butanetorch", 	price = 2, 		amount = 1000,},
+		{name = "dabrig", 		price = 2, 		amount = 1000,},
+		{name = "mdwoods", 		price = 2, 		amount = 1000},
+	},
+	Products = {
+		{name = "weed_white-widow_seed",    price = 15, amount = 150,  minrep = 0},
+		{name = "weed_skunk_seed", 		    price = 15, amount = 150,  minrep = 0},
+		{name = "weed_purple-haze_seed",	price = 15, amount = 150,  minrep = 0},
+		{name = "weed_og-kush_seed", 	    price = 15, amount = 150,  minrep = 0},
+		{name = "weed_amnesia_seed", 		price = 15, amount = 150,  minrep = 0},
+	},
+	ProductsStupidNameRewrite = {
+		{name = "weed_whitewidow_seed",   	price = 15, amount = 150, minrep = 0},
+		{name = "weed_skunk_seed", 			price = 15, amount = 150, minrep = 0},
+		{name = "weed_purplehaze_seed",		price = 15, amount = 150, minrep = 0},
+		{name = "weed_ogkush_seed", 	    price = 15, amount = 150, minrep = 0},
+		{name = "weed_amnesia_seed", 		price = 15, amount = 150, minrep = 0},
+	}
+}
 
-RegisterServerEvent("md-drugs:server:travellingmerchantox", function(amount, money, item, price,table,num)
-	local src = source local Player = QBCore.Functions.GetPlayer(src)
-	
-	if not table[num]['name'] == item then return end
-	if Player.Functions.RemoveMoney(tostring(money), tonumber(price) * tonumber(amount)) then
-		TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "add", amount)
-		Player.Functions.AddItem(item, amount)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bought ' .. amount .. ' Of ' .. item .. ' For ' .. tonumber(price) * tonumber(amount) .. '!', 'merchant')
+lib.callback.register('md-drugs:server:menu', function(source, data)
+    local src = source
+    if data == 'travellingMerchant' then 
+        return {table = stores.travel, des = '$',  id = 'travellingMerchant', title = 'travelling Merchant'}
+    elseif data == 'dealermenu' then
+        local table 
+        if Config.StupidassNewQbItemName then  table = stores.ProductsStupidNameRewrite else table = stores.Products end
+            return {table = table,  id = 'dealermenu', title = "Dealer Menu"}
+    elseif data == 'WeedShop' then
+        return {table = stores.Weed, id = 'WeedShop', title = "Weed Shop"}
+    end
+end)
+
+RegisterServerEvent("md-drugs:server:purchaseGoods", function(amount, money, item, price,table,num)
+	local src = source local Player = getPlayer(src)
+	for i = 1, #table do 
+		if table[i].name == item then
+		if not table[i].price == price then return end
+			if Player.Functions.RemoveMoney(tostring(money), tonumber(table[i].price) * tonumber(amount)) then
+				AddItem(src, item, amount)
+				Log(GetName(src) .. ' Bought ' .. amount .. ' Of ' .. item .. ' For ' .. tonumber(price) * tonumber(amount) .. '!', 'merchant')
+			end
+		end
 	end
+end)
 
+lib.callback.register('md-drugs:server:GetMerchant', function(source)
+	return loc
 end)

server/weed.lua

@@ -20,291 +20,93 @@ function WeedCooldown(loc)
     end)
 end
 
-RegisterNetEvent("weed:pickupCane")
-AddEventHandler("weed:pickupCane", function(loc)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.WeedPlant[loc].location) then return end
+RegisterNetEvent("weed:pickupCane", function(loc)
+	local src = source
     if not Config.WeedPlant[loc].taken then
         Config.WeedPlant[loc].taken = true
         GlobalState.WeedPlant = Config.WeedPlant
         TriggerClientEvent("weed:removeCane", -1, loc)
         WeedCooldown(loc)
-        local Player = QBCore.Functions.GetPlayer(source)
-        AddItem('wetcannabis', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Weed With a distance of ' .. dist(source, playerPed, Config.WeedPlant[loc].location) .. ' vectors', 'weed')
-    
+        AddItem(src, 'wetcannabis', 1)
+		Log(GetName(source) .. ' Picked Weed With a distance of ' .. dist(source, Config.WeedPlant[loc].location) .. ' vectors', 'weed')
     end
 end)
 --------------- events
+
 RegisterServerEvent('md-drugs:server:dryoutweed', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
-	if RemoveItem("wetcannabis", 1) then
-    	AddItem("drycannabis", 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Dried Weed', 'weed')
+    local Player = getPlayer(src)
+	if RemoveItem(src,"wetcannabis", 1) then
+    	AddItem(src,"drycannabis", 1)
+		Log(GetName(source) .. ' Dried Weed', 'weed')
     else
-		Notifys(Lang.Weed.nodry, "error")
+		Notifys(src, Lang.Weed.nodry, "error")
 	end
 end)
 
-
-RegisterServerEvent('md-drugs:server:makebutter', function()
-  local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
-  local recipe = {'mdbutter', 'grindedweed'}
-  local have = 0 
-  for k, v in pairs (recipe) do 
-	if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-  end
-	if have == 2 then 		
-	  RemoveItem('mdbutter', 1) 
-	  RemoveItem('grindedweed', 1) 
-	  AddItem('cannabutter', 1 )
-	  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Canna Butter ', 'weed')
-	end	
-end)
-
-
-RegisterServerEvent('md-drugs:server:makebrownies', function()
-  	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	  local recipe = {'cannabutter', 'flour', 'chocolate' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
-	if have == 3 then 
-		RemoveItem('cannabutter', 1)
-		RemoveItem('flour', 1)
-		RemoveItem('chocolate', 1)
-		AddItem('specialbrownie', 1 )
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Special Brownies ', 'weed')
-	end
-end)
-
-RegisterServerEvent('md-drugs:server:makecookies', function()
-  	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	local recipe = {'cannabutter', 'flour' }
-	local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
-	if have == 2 then
-		RemoveItem('cannabutter', 1)
-		RemoveItem('flour', 1)
-		AddItem('specialcookie', 1 ) 
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Special Cookies ', 'weed')
-	end
-end)
-
-RegisterServerEvent('md-drugs:server:makechocolate', function()
-  	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	  local recipe = {'cannabutter', 'chocolate' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
- 	if have == 2 then
-		RemoveItem('cannabutter', 1)
-		RemoveItem('chocolate', 1)
-		AddItem('specialchocolate', 1 ) 
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Special Chocolate ', 'weed')
-	end
-end)
-
-RegisterServerEvent('md-drugs:server:makemuffin', function()
-  	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	  local recipe = {'cannabutter', 'flour' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
- 	if have == 2 then
-		RemoveItem('cannabutter', 1)
-		RemoveItem('flour', 1)
-		AddItem('specialmuffin', 1 )
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Special Muffin ', 'weed')
-	end
-end)
-
-RegisterServerEvent('md-drugs:server:makeoil', function()
-  	local src = source
-	  local Player = QBCore.Functions.GetPlayer(src)
-  	local recipe = {'grindedweed', 'butane' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
- 	if have == 2 then
-		RemoveItem('butane', 1)
-		RemoveItem('grindedweed', 1)
-		AddItem('shatter', 1 )
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Shatter ', 'weed')
-	end	
-end)
-
-
-
-RegisterServerEvent('md-drugs:server:rollblunt', function()
-  	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	  local recipe = {'bluntwrap', 'grindedweed' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
- 	if have == 2 then
-	  TriggerClientEvent("md-drugs:client:rollanim", src)
- 	 	RemoveItem('bluntwrap', 1)
-  		RemoveItem('grindedweed', 1)
-		AddItem('blunt', 1 )
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Rolled A Blunt ', 'weed')
-	end	
-end)
-
-RegisterServerEvent('md-drugs:server:rollleanblunt', function()
-  	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-  	local chance = math.random(1,10)
-	  local recipe = {'bluntwrap', 'mdlean' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
- 	if have == 2 then
-	  TriggerClientEvent("md-drugs:client:rollanim", src)
-		RemoveItem("bluntwrap", 1)
-		AddItem("leanbluntwrap", 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Rolled A Lean Blunt ', 'weed')
-	if chance > 8 then
-		RemoveItem("mdlean", 1)
-	end
+local bluntwrap = {'mdreddextro','mdlean'}
+for k, v in pairs (bluntwrap) do 
+	QBCore.Functions.CreateUseableItem(v, function(source, item) 
+		local src = source
+		TriggerClientEvent('md-drugs:client:makeBluntWrap', src)
+	end)
 end
-end)
 
-RegisterServerEvent('md-drugs:server:rolldextroblunt', function()
-  local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
-  local chance = math.random(1,10)
-  local chance = math.random(1,10)
-	  local recipe = {'mdreddextro', 'mdlean' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
- 	if have == 2 then
-	RemoveItem("bluntwrap", 1)
-	AddItem("dextrobluntwrap", 1)
-	TriggerClientEvent("md-drugs:client:rollanim", src)
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Rolled A Dextro Blunt ', 'weed')
-	if chance > 8 then
-		Player.Functions.RemoveItem("mdreddextro", 1)
-	end	
+local bluntwraps = {'leanbluntwrap', 'dextrobluntwrap', 'bluntwrap'}
+
+for k, v in pairs (bluntwraps) do 
+	QBCore.Functions.CreateUseableItem(v, function(source, item)
+		local src = source
+		TriggerClientEvent('md-drugs:client:rollBlunt', source)
+	end)
 end
+
+
+RegisterServerEvent('md-drugs:server:MakeWeedItems', function(data)
+	local src = source
+	local Player = getPlayer(src) 
+	if not Player then return end
+	if not GetRecipe(src, data.recipe, data.table, data.item) then return end
 end)
 
-RegisterServerEvent('md-drugs:server:rollchewyblunt', function()
-  	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	  local recipe = {'bluntwrap', 'loosecoke', 'grindedweed' }
-	  local have = 0 
-	  for k, v in pairs (recipe) do 
-		if Itemcheck(Player, v, 1, 'true') then have = have + 1 end
-	  end
- 	if have == 3 then
-		RemoveItem("bluntwrap", 1)
-		RemoveItem("loosecoke", 1)
-		RemoveItem("grindedweed", 1)
-		AddItem("chewyblunt", 1)
-		TriggerClientEvent("md-drugs:client:rollanim", src)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Rolled A Chewy Blunt ', 'weed')
-		
-	end
-end)
------------------------- usuable items
-QBCore.Functions.CreateUseableItem("leanbluntwrap", function(source, item)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local keef = Player.Functions.GetItemByName("grindedweed")
-
-	if keef and keef.amount > 0 then 
-		if Player.Functions.RemoveItem('grindedweed', 1) then
-			TriggerClientEvent("md-drugs:client:rollanim", src)
-			Player.Functions.RemoveItem("leanbluntwrap", 1) 
-			Player.Functions.AddItem('leanblunts', 1)
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items['leanblunts'], "add", 1)
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items['grindedweed'], "remove", 1)
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items['leanbluntwrap'], "remove", 1)
-			
-		end
-	else
-		Notifys(Lang.Weed.noweed, "error")
-	end
-end)
-QBCore.Functions.CreateUseableItem("dextrobluntwrap", function(source, item)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local keef = Player.Functions.GetItemByName("grindedweed")
-	
-	if keef and keef.amount > 0 then 
-		if Player.Functions.RemoveItem('grindedweed', 1) then
-			TriggerClientEvent("md-drugs:client:rollanim", src)
-			Player.Functions.RemoveItem("dextrobluntwrap", 1) 
-			Player.Functions.AddItem('dextroblunts', 1)
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items['dextroblunts'], "add", 1)
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items['grindedweed'], "remove", 1)
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items['dextrobluntwrap'], "remove", 1)
-		end
-	else
-		Notifysu('You Need Keef', 'error', src)
-	end
+RegisterServerEvent('md-drugs:server:makeoil', function(data)
+	local src = source
+	local Player = getPlayer(src) 
+	if not Player then return end
+	if not GetRecipe(src, 'weed', 'oil', 'shatter') then return end
 end)
 
 QBCore.Functions.CreateUseableItem("dabrig", function(source, item)
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
+local Player = getPlayer(src)
 
 if Player.Functions.GetItemByName("butanetorch") then 
-	if RemoveItemu("shatter", 1, src) then
-		Notifysu('test', 'success', src)
+	if RemoveItem(src, "shatter", 1) then
+		Notifys(src, 'test', 'success')
     	TriggerClientEvent("md-drugs:client:dodabs", src)
     end
 end
 end)
 
-QBCore.Functions.CreateUseableItem("bluntwrap", function(source, item)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-TriggerClientEvent('md-drugs:client:bluntwraps', src)
-end)
-
 QBCore.Functions.CreateUseableItem("weedgrinder", function(source, item)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-
-if Player.Functions.RemoveItem("drycannabis",1 ) then 
-	Player.Functions.AddItem("grindedweed", 1)
-	TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["grindedweed"], "add", 1)
-	TriggerClientEvent("md-drugs:client:grind", src)
-else
-	Notifysu('You Need Dried Weed', 'error', src)
-end
+	local src = source
+	if RemoveItem(src, "drycannabis",1 ) then 
+		AddItem(src, "grindedweed", 1)
+		TriggerClientEvent("md-drugs:client:grind", src)
+	else
+		Notifys(src,'You Need Dried Weed', 'error')
+	end
 end)
 
 QBCore.Functions.CreateUseableItem("mdwoods", function(source, item)
-local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-TriggerClientEvent("md-drugs:client:rollanim", src)
-Wait(4000)
-if Player.Functions.RemoveItem("mdwoods",1 ) then 
-	Player.Functions.AddItem("bluntwrap", 5)
-	Player.Functions.AddItem("tobacco", 5)
-	TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["bluntwrap"], "add", 1)
-	TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["tobacco"], "add", 1)
-end
+	local src = source
+	local Player = getPlayer(src)
+	TriggerClientEvent("md-drugs:client:rollanim", src)
+	Wait(4000)
+	if RemoveItem(src, "mdwoods",1 ) then 
+		AddItem(src, "bluntwrap", 5)
+		AddItem(src, "tobacco", 5)
+	end
 end)
 
 

server/wholesale.lua

@@ -7,15 +7,14 @@ local xtc = {"white_playboys",  "white_playboys2",  "white_playboys3",  "white_p
 
 QBCore.Functions.CreateUseableItem("cokeburner", function(source, item)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(source)
+    local Player = getPlayer(source)
 		TriggerClientEvent("md-drugs:client:GetLocation", src, 'coke', "Bring Me All The Coke You Have")
 end)
- 
+
 RegisterServerEvent('md-drugs:server:wholesalecoke', function()	
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 	local price = math.random(Config.Wcoke.min, Config.Wcoke.max)
-	
     for k, v in pairs(coke) do
         local item = Player.Functions.GetItemByName(v)
 
@@ -23,31 +22,28 @@ RegisterServerEvent('md-drugs:server:wholesalecoke', function()
             local removed = Player.Functions.RemoveItem(v, item.amount)
             Player.Functions.AddMoney("cash", item.amount * price)
 			Notifys("You received " .. item.amount * price .. "  Dollars!" , "success")
-              Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Wholesaled Drugs ', 'wholesale')
+              Log(GetName(source) .. ' Wholesaled Drugs ', 'wholesale')
         end
     end
 end)
 
-
 QBCore.Functions.CreateUseableItem("crackburner", function(source, item)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(source)
-	
+    local Player = getPlayer(source)
 	TriggerClientEvent("md-drugs:client:GetLocation", src, 'crack', "Bring Me All The Crack You Have")
 end)
 
 RegisterServerEvent('md-drugs:server:wholesalecrack', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 	local price = math.random(Config.Wcrack.min, Config.Wcrack.max)
-	
     for k, v in pairs(crack) do
         local item = Player.Functions.GetItemByName(v)
         if item and item.amount > 0 then
             local removed = Player.Functions.RemoveItem(v, item.amount)
             Player.Functions.AddMoney("cash", item.amount * price)
 			Notifys("You received " .. item.amount * price .. "  Dollars!" , "success")
-            Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Wholesaled Drugs ', 'wholesale')        
+            Log(GetName(source) .. ' Wholesaled Drugs ', 'wholesale')        
         end
     end
 end)
@@ -55,15 +51,13 @@ end)
 
 QBCore.Functions.CreateUseableItem("lsdburner", function(source, item)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(source)
-	
+    local Player = getPlayer(source)
 	TriggerClientEvent("md-drugs:client:GetLocation", src, 'lsd', "Bring Me All The lsd You Have")
-    
 end)
 
 RegisterServerEvent('md-drugs:server:wholesalelsd', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 	local price = math.random(Config.Wlsd.min, Config.Wlsd.max)
 	
     for k, v in pairs(lsd) do
@@ -73,7 +67,7 @@ RegisterServerEvent('md-drugs:server:wholesalelsd', function()
             local removed = Player.Functions.RemoveItem(v, item.amount)
             Player.Functions.AddMoney("cash", item.amount * price)
 			Notifys("You received " .. item.amount * price .. "  Dollars!" , "success")
-            Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Wholesaled Drugs ', 'wholesale')
+            Log(GetName(source) .. ' Wholesaled Drugs ', 'wholesale')
         end
     end
 end)
@@ -81,16 +75,14 @@ end)
 
 QBCore.Functions.CreateUseableItem("heroinburner", function(source, item)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(source)
-	
+    local Player = getPlayer(source)
 	TriggerClientEvent("md-drugs:client:GetLocation", src, 'heroin', "Bring Me All The Heroin You Have")
 end)
 
 RegisterServerEvent('md-drugs:server:wholesaleheroin', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 	local price = math.random(Config.WHeroin.min, Config.WHeroin.max)
-	
     for k, v in pairs(heroin) do
         local item = Player.Functions.GetItemByName(v)
 
@@ -98,23 +90,21 @@ RegisterServerEvent('md-drugs:server:wholesaleheroin', function()
             local removed = Player.Functions.RemoveItem(v, item.amount)
             Player.Functions.AddMoney("cash", item.amount * price)
 			Notifys("You received " .. item.amount * price .. "  Dollars!" , "success")
-            Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Wholesaled Drugs ', 'wholesale')
+            Log(GetName(source) .. ' Wholesaled Drugs ', 'wholesale')
         end
     end
 end)
 ---- xtc
 QBCore.Functions.CreateUseableItem("xtcburner", function(source, item)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(source)
-	
+    local Player = getPlayer(source)
 	TriggerClientEvent("md-drugs:client:GetLocation", src, 'xtc', "Bring Me All The xtc You Have")
 end)
 
 RegisterServerEvent('md-drugs:server:wholesalextc', function()
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 	local price = math.random(Config.WXTC.min, Config.WXTC.max)
-	
     for k, v in pairs(xtc) do
         local item = Player.Functions.GetItemByName(v)
 
@@ -122,7 +112,7 @@ RegisterServerEvent('md-drugs:server:wholesalextc', function()
             local removed = Player.Functions.RemoveItem(v, item.amount)
             Player.Functions.AddMoney("cash", item.amount * price)
             Notifys("You received " .. item.amount * price .. "  Dollars!" , "success")
-            Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Wholesaled Drugs ', 'wholesale')  
+            Log(GetName(source) .. ' Wholesaled Drugs ', 'wholesale')  
         end
     end
 end)
@@ -130,34 +120,34 @@ end)
 
 RegisterServerEvent('md-drugs:server:RemoveBurner', function(item)
 	local src = source
-    local Player = QBCore.Functions.GetPlayer(src)
+    local Player = getPlayer(src)
 
     if item == 'coke' then
         if Player.Functions.RemoveItem('cokeburner', 1) then
         else
             DropPlayer(src, 'How Did You Trigger The Event Without The Item?')    
-        end    
+        end
     elseif item == 'crack' then 
         if Player.Functions.RemoveItem('crackburner', 1) then
         else
             DropPlayer(src, 'How Did You Trigger The Event Without The Item?')    
-        end     
+        end
     elseif item == 'heroin' then
         if Player.Functions.RemoveItem('heroinburner', 1) then
         else
             DropPlayer(src, 'How Did You Trigger The Event Without The Item?')    
-        end     
+        end
     elseif item == 'lsd' then
         if Player.Functions.RemoveItem('lsdburner', 1) then
         else
             DropPlayer(src, 'How Did You Trigger The Event Without The Item?')    
-        end     
+        end
     elseif item == 'xtc' then
         if Player.Functions.RemoveItem('xtcburner', 1) then
         else
             DropPlayer(src, 'How Did You Trigger The Event Without The Item?')    
-        end      
-    end          
+        end
+    end
 end)
 
 

server/xtc.lua

@@ -2,24 +2,22 @@ local QBCore = exports['qb-core']:GetCoreObject()
 -------------------- stealing ingridients 
 RegisterServerEvent('md-drugs:server:stealisosafrole', function(num)
   	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.isosafrole[num]['loc']) then return end
-  	if AddItem("isosafrole", 1) then 
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stole isosafrole with a distance of  ' .. dist(source, playerPed, Config.isosafrole[num]['loc']) .. ' vectors!', 'xtc')
+  	local Player = getPlayer(src)
+	if CheckDist(source, Config.isosafrole[num]['loc']) then return end
+  	if AddItem(src, "isosafrole", 1) then 
+		Log(GetName(source) .. ' Stole isosafrole with a distance of  ' .. dist(source, Config.isosafrole[num]['loc']) .. ' vectors!', 'xtc')
   	end	
 end)
 
 RegisterServerEvent('md-drugs:server:stealmdp2p', function(num)
   	local src = source
-  	local Player = QBCore.Functions.GetPlayer(src)
-	local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.mdp2p[num]['loc']) then return end
-  	if AddItem("mdp2p", 1) then 
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stole MDP2P with a distance of  ' .. dist(source, playerPed, Config.mdp2p[num]['loc']) .. ' vectors!', 'xtc')
-  	
+  	local Player = getPlayer(src)
+	if CheckDist(source, Config.mdp2p[num]['loc']) then return end
+  	if AddItem(src,"mdp2p", 1) then 
+		Log(GetName(source) .. ' Stole MDP2P with a distance of  ' .. dist(source, Config.mdp2p[num]['loc']) .. ' vectors!', 'xtc')
   	end	
 end)
+
 local presses = {
 	{item = 'singlepress',  data = 'single'},
 	{item = 'dualpress', 	data = 'dual'},
@@ -29,165 +27,107 @@ local presses = {
 for k, v in pairs (presses) do 
 QBCore.Functions.CreateUseableItem(v.item, function(source, item)
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(source)
+local Player = getPlayer(src)
 	if TriggerClientEvent("md-drugs:client:setpress", src, v.data) then
-		Player.Functions.RemoveItem(v.item, 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Placed A ' .. v.item .. ' At ' .. GetEntityCoords(playerPed) .. '!', 'xtc')
+		RemoveItem(src, v.item, 1)
+		Log(GetName(source) .. ' Placed A ' .. v.item .. ' At ' .. GetCoords(source) .. '!', 'xtc')
 	end
 end)
 end
 
 RegisterServerEvent('md-drugs:server:getpressback', function(type)
 local src = source
-local Player = QBCore.Functions.GetPlayer(src)
-local playerPed = GetPlayerPed(source)
+local Player = getPlayer(src)
 	if type == 'single' then
-		if Player.Functions.GetItemByName('singlepress') then  Notifys('You Already Have A Kit') return end
-		AddItem('singlepress', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Their Single Press At ' .. GetEntityCoords(playerPed) .. '!', 'xtc')
+		if Player.Functions.GetItemByName('singlepress') then  Notifys(src, 'You Already Have A Kit') return end
+		AddItem(src, 'singlepress', 1)
+		Log(GetName(source) .. ' Picked Their Single Press At ' .. GetCoords(source) .. '!', 'xtc')
 	elseif type == 'dual' then
-		if Player.Functions.GetItemByName('dualpress') then  Notifys('You Already Have A Kit') return end
-		AddItem('dualpress', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Their Dual Press At ' .. GetEntityCoords(playerPed) .. '!', 'xtc')
+		if Player.Functions.GetItemByName('dualpress') then  Notifys(src, 'You Already Have A Kit') return end
+		AddItem(src, 'dualpress', 1)
+		Log(GetName(source) .. ' Picked Their Dual Press At ' .. GetCoords(source) .. '!', 'xtc')
 	elseif type == 'triple' then
-		if Player.Functions.GetItemByName('triplepress') then  Notifys('You Already Have A Kit') return end
-		AddItem('triplepress', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Their Triple Press At ' .. GetEntityCoords(playerPed) .. '!', 'xtc')
+		if Player.Functions.GetItemByName('triplepress') then  Notifys(src, 'You Already Have A Kit') return end
+		AddItem(src, 'triplepress', 1)
+		Log(GetName(source) .. ' Picked Their Triple Press At ' .. GetCoords(source) .. '!', 'xtc')
 	elseif type == 'quad' then
-		if Player.Functions.GetItemByName('quadpress') then  Notifys('You Already Have A Kit') return end
-		AddItem('quadpress', 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Picked Their Quad Press At ' .. GetEntityCoords(playerPed) .. '!', 'xtc')
+		if Player.Functions.GetItemByName('quadpress') then  Notifys(src, 'You Already Have A Kit') return end
+		AddItem(src, 'quadpress', 1)
+		Log(GetName(source) .. ' Picked Their Quad Press At ' .. GetCoords(source) .. '!', 'xtc')
 	end		
 end)
 
 
 RegisterServerEvent('md-drugs:server:makextc', function(data)
   local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
-  if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
+  local Player = getPlayer(src)
+  if not Itemcheck(src, 'raw_xtc', 1) then return end
   	if data.data == 'single' then 
 		if data.color == 'white' then 
-			if RemoveItem('raw_xtc', 1) then
-				AddItem('white_xtc', 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Single Stack White Pill!', 'xtc')
-			end
+			if not GetRecipe(src, 'xtc', 'singlestack', 'white') then return end
+				Log(GetName(source) .. ' Made A Single Stack White Pill!', 'xtc')
 		elseif data.color == 'red' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'loosecoke', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('loosecoke', 1)
-			AddItem('red_xtc', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Single Stack Red Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'singlestack', 'red') then return end
+			Log(GetName(source) .. ' Made A Single Stack Red Pill!', 'xtc')
 		elseif data.color == 'orange' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'heroinvial', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('heroinvial', 1)
-			AddItem('orange_xtc', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Single Stack Orange Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'singlestack', 'orange') then return end
+			Log(GetName(source) .. ' Made A Single Stack Orange Pill!', 'xtc')
 		elseif data.color == 'blue' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'crackrock', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('crackrock', 1)
-			AddItem('blue_xtc', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Single Stack Blue Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'singlestack', 'blue') then return end
+			Log(GetName(source) .. ' Made A Single Stack Blue Pill!', 'xtc')
 		end
 	elseif data.data == 'dual' then
 		if data.color == 'white' then 
-			if RemoveItem('raw_xtc', 1) then
-				AddItem('white_xtc2', 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Dual Stack White Pill!', 'xtc')
-			end
+			if not GetRecipe(src, 'xtc', 'dualstack', 'white') then return end
+				Log(GetName(source) .. ' Made A Dual Stack White Pill!', 'xtc')
 		elseif data.color == 'red' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'loosecoke', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('loosecoke', 1)
-			AddItem('red_xtc2', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Dual Stack Red Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'dualstack', 'red') then return end
+			Log(GetName(source) .. ' Made A Dual Stack Red Pill!', 'xtc')
 		elseif data.color == 'orange' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'heroinvial', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('heroinvial', 1)
-			AddItem('orange_xtc2', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Dual Stack Orange Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'dualstack', 'orange') then return end
+			Log(GetName(source) .. ' Made A Dual Stack Orange Pill!', 'xtc')
 		elseif data.color == 'blue' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'crackrock', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('crackrock', 1)
-			AddItem('blue_xtc2', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Dual Stack Blue Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'dualstack', 'blue') then return end
+			Log(GetName(source) .. ' Made A Dual Stack Blue Pill!', 'xtc')
 		end
 	elseif data.data == 'triple' then
 		if data.color == 'white' then 
-			if RemoveItem('raw_xtc', 1) then
-				AddItem('white_xtc3', 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Triple Stack White Pill!', 'xtc')
-			end
+			if not GetRecipe(src, 'xtc', 'triplestack', 'white') then return end
+				Log(GetName(source) .. ' Made A Triple Stack White Pill!', 'xtc')
 		elseif data.color == 'red' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'loosecoke', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('loosecoke', 1)
-			AddItem('red_xtc3', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Triple Stack Red Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'triplestack', 'red') then return end
+			Log(GetName(source) .. ' Made A Triple Stack Red Pill!', 'xtc')
 		elseif data.color == 'orange' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'heroinvial', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('heroinvial', 1)
-			AddItem('orange_xtc3', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Triple Stack Orange Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'triplestack', 'orange') then return end
+			Log(GetName(source) .. ' Made A Triple Stack Orange Pill!', 'xtc')
 		elseif data.color == 'blue' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'crackrock', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('crackrock', 1)
-			AddItem('blue_xtc3', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Triple Stack Blue Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'triplestack', 'blue') then return end
+			Log(GetName(source) .. ' Made A Triple Stack Blue Pill!', 'xtc')
 		end
 	elseif data.data == 'quad' then
 		if data.color == 'white' then 
-			if RemoveItem('raw_xtc', 1) then
-				AddItem('white_xtc4', 1)
-				Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Quad Stack White Pill!', 'xtc')
-			end
+			if not GetRecipe(src, 'xtc', 'quadstack', 'white') then return end
+				Log(GetName(source) .. ' Made A Quad Stack White Pill!', 'xtc')
 		elseif data.color == 'red' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'loosecoke', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('loosecoke', 1)
-			AddItem('red_xtc4', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Quad Stack Red Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'quadstack', 'red') then return end
+			Log(GetName(source) .. ' Made A Quad Stack Red Pill!', 'xtc')
 		elseif data.color == 'orange' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'heroinvial', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('heroinvial', 1)
-			AddItem('orange_xtc4', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Quad Stack Orange Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'quadstack', 'orange') then return end
+			Log(GetName(source) .. ' Made A Quad Stack Orange Pill!', 'xtc')
 		elseif data.color == 'blue' then
-			if not Itemcheck(Player, 'raw_xtc', 1, 'true') then return end
-			if not Itemcheck(Player, 'crackrock', 1, 'true') then return end
-			RemoveItem('raw_xtc', 1)
-			RemoveItem('crackrock', 1)
-			AddItem('blue_xtc4', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made A Quad Stack Blue Pill!', 'xtc')
+			if not GetRecipe(src, 'xtc', 'quadstack', 'blue') then return end
+			Log(GetName(source) .. ' Made A Quad Stack Blue Pill!', 'xtc')
 		end
 	end
 end)
 
 RegisterServerEvent('md-drugs:server:buypress', function()
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
+	local Player = getPlayer(src)
 	
 	  if Player.Functions.RemoveMoney("cash", 20000) then
-		  AddItem("singlepress", 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Bought A Pill Press', 'xtc')
+		  AddItem(src, "singlepress", 1)
+		  Log(GetName(source) .. ' Bought A Pill Press', 'xtc')
 	  else
 		  Notifys(Lang.xtc.cash, "error")
 	  end
@@ -195,77 +135,34 @@ RegisterServerEvent('md-drugs:server:buypress', function()
 
 RegisterServerEvent('md-drugs:server:upgradepress', function(data)
   local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
-  local playerPed = GetPlayerPed(source)
 
-    if CheckDist(source, playerPed, Config.buypress) then return end
+    if CheckDist(source, Config.buypress) then return end
     if data == 'dual' then
-		local have = 0
-		local pill = {'white_xtc', 'blue_xtc', 'red_xtc', 'orange_xtc'}
-		for k, v in pairs (pill) do
-			if Itemcheck(Player, v, 20, 'true') then have = have + 1 end
-		end
-	 	if have == 4 then 
-			if not Itemcheck(Player, 'singlepress', 1, 'true') then return end
-			RemoveItem('white_xtc', 20)
-			RemoveItem('blue_xtc', 20)
-			RemoveItem('red_xtc', 20)
-			RemoveItem('orange_xtc', 20)
-			RemoveItem('singlepress', 1)
-			AddItem('dualpress', 1)
-			Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Upgraded Press To Dual Press', 'xtc')
-		end
+		if not GetRecipe(src, 'xtc', 'press', 'dual') then return end
+		Log(GetName(source) .. ' Upgraded Press To Dual Press', 'xtc')
     elseif data == 'triple' then
-		local have = 0
-		local pill = {'white_xtc2', 'blue_xtc2', 'red_xtc2', 'orange_xtc2'}
-		for k, v in pairs (pill) do
-			if Itemcheck(Player, v, 50, 'true') then have = have + 1 end
-		end
-	 	if have == 4 then 
-		  RemoveItem('dualpress', 1)
-		  RemoveItem('white_xtc2', 50)
-		  RemoveItem('blue_xtc2', 50)
-		  RemoveItem('red_xtc2', 50)
-		  RemoveItem('orange_xtc2', 50)
-		  AddItem('triplepress', 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Upgraded Press To Triple Press', 'xtc')
-	  end
+		if not GetRecipe(src, 'xtc', 'press', 'triple') then return end
+		Log(GetName(source) .. ' Upgraded Press To Triple Press', 'xtc')
     elseif data == 'quad' then
-		local have = 0
-		local pill = {'white_xtc3', 'blue_xtc3', 'red_xtc3', 'orange_xtc3'}
-		for k, v in pairs (pill) do
-			if Itemcheck(Player, v, 150, 'true') then have = have + 1 end
-		end
-	 	if have == 4 then 
-		  RemoveItem('triplepress', 1)
-		  RemoveItem('white_xtc3', 150)
-		  RemoveItem('blue_xtc3', 150)
-		  RemoveItem('red_xtc3', 150)
-		  RemoveItem('orange_xtc3', 150)
-		  AddItem('quadpress', 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Upgraded Press To Quad Press', 'xtc')
-	  end
+		if not GetRecipe(src, 'xtc', 'press', 'quad') then return end
+		  Log(GetName(source) .. ' Upgraded Press To Quad Press', 'xtc')
 	else
-		Notify('huh', 'error')
+		Notifys(src, 'huh', 'error')
 	end
 end)
 
 ------------- making powder
 RegisterServerEvent('md-drugs:server:makingrawxtc', function(num)
   local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
-  local playerPed = GetPlayerPed(source)
-  if CheckDist(source, playerPed, Config.rawxtcloc[num]['loc']) then return end
-  if not Itemcheck(Player, 'mdp2p', 1, 'true') and not Itemcheck(Player, 'isosafrole', 1, 'true') then return end
-	RemoveItem('mdp2p', 1)
-	RemoveItem('isosafrole', 1)
-    AddItem("raw_xtc", 1)	
-	Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Made Raw XTC With A Distance Of ' .. dist(source, playerPed, Config.rawxtcloc[num]['loc']) .. '!', 'xtc')
+  local Player = getPlayer(src)
+  	if CheckDist(source, Config.rawxtcloc[num]['loc']) then return end
+  	if not GetRecipe(src, 'xtc', 'raw', 'raw_xtc') then return end
+	Log(GetName(source) .. ' Made Raw XTC With A Distance Of ' .. dist(source, Config.rawxtcloc[num]['loc']) .. '!', 'xtc')
 end)
   
 RegisterServerEvent('md-drugs:server:stampwhite', function(num)
   local src = source
-  local Player = QBCore.Functions.GetPlayer(src)
+  local Player = getPlayer(src)
   local one = {'white_playboys', 'white_aliens', 'white_pl', 'white_trolls', 'white_cats'}
   local chance = math.random(#one)
   local two = {'white_playboys2', 'white_aliens2', 'white_pl2', 'white_trolls2', 'white_cats2'}
@@ -274,21 +171,20 @@ RegisterServerEvent('md-drugs:server:stampwhite', function(num)
   local chance3 = math.random(#one)
   local four = {'white_playboys4', 'white_aliens4', 'white_pl4', 'white_trolls4', 'white_cats4'}
   local chance4 = math.random(#one)
-  local playerPed = GetPlayerPed(source)
-	if CheckDist(source, playerPed, Config.stamp[num]['loc']) then return end
+	if CheckDist(source, Config.stamp[num]['loc']) then return end
 
-	if Player.Functions.RemoveItem("white_xtc", 1) then
-		AddItem(one[chance], 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Single White Pill And Got ' .. one[chance] .. '!', 'xtc')
-	elseif Player.Functions.RemoveItem("white_xtc2", 1) then
-		AddItem(two[chance2], 1)
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Dual White Pill And Got ' .. two[chance2] .. '!', 'xtc')
-	elseif Player.Functions.RemoveItem("white_xtc3", 1) then
-		AddItem(three[chance3], 1) 
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Triple White Pill And Got ' .. three[chance3] .. '!', 'xtc')
-	elseif Player.Functions.RemoveItem("white_xtc4", 1) then
-		AddItem(four[chance4], 1) 
-		Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Quad White Pill And Got ' .. four[chance4] .. '!', 'xtc')
+	if RemoveItem(src, "white_xtc", 1) then
+		AddItem(src, one[chance], 1)
+		Log(GetName(source) .. ' Stamped A Single White Pill And Got ' .. one[chance] .. '!', 'xtc')
+	elseif RemoveItem(src, "white_xtc2", 1) then
+		AddItem(src, two[chance2], 1)
+		Log(GetName(source) .. ' Stamped A Dual White Pill And Got ' .. two[chance2] .. '!', 'xtc')
+	elseif RemoveItem(src, "white_xtc3", 1) then
+		AddItem(src, three[chance3], 1) 
+		Log(GetName(source) .. ' Stamped A Triple White Pill And Got ' .. three[chance3] .. '!', 'xtc')
+	elseif RemoveItem(src, "white_xtc4", 1) then
+		AddItem(src, four[chance4], 1) 
+		Log(GetName(source) .. ' Stamped A Quad White Pill And Got ' .. four[chance4] .. '!', 'xtc')
 	else 
 		Notifys('You Dont Have Unstamped White Pills', 'error')
 	end
@@ -296,7 +192,7 @@ end)
 
 RegisterServerEvent('md-drugs:server:stampred', function(num)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
+	local Player = getPlayer(src)
 	local one = {'red_playboys', 'red_aliens', 'red_pl', 'red_trolls', 'red_cats'}
 	local chance = math.random(#one)
 	local two = {'red_playboys2', 'red_aliens2', 'red_pl2', 'red_trolls2', 'red_cats2'}
@@ -306,20 +202,20 @@ RegisterServerEvent('md-drugs:server:stampred', function(num)
 	local four = {'red_playboys4', 'red_aliens4', 'red_pl4', 'red_trolls4', 'red_cats4'}
 	local chance4 = math.random(#one)
 	local playerPed = GetPlayerPed(source)
-	  if CheckDist(source, playerPed, Config.stamp[num]['loc']) then return end
+	  if CheckDist(source, Config.stamp[num]['loc']) then return end
   
-	  if Player.Functions.RemoveItem("red_xtc", 1) then
-		  AddItem(one[chance], 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Single Red Pill And Got ' .. one[chance] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("red_xtc2", 1) then
-		  AddItem(two[chance2], 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Dual Red Pill And Got ' .. two[chance2] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("red_xtc3", 1) then
-		  AddItem(three[chance3], 1) 
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Triple Red Pill And Got ' .. three[chance3] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("red_xtc4", 1) then
-		  AddItem(four[chance4], 1) 
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Quad Red Pill And Got ' .. four[chance4] .. '!', 'xtc')
+	  if RemoveItem(src, "red_xtc", 1) then
+		  AddItem(src, one[chance], 1)
+		  Log(GetName(source) .. ' Stamped A Single Red Pill And Got ' .. one[chance] .. '!', 'xtc')
+	  elseif RemoveItem(src, "red_xtc2", 1) then
+		  AddItem(src, two[chance2], 1)
+		  Log(GetName(source) .. ' Stamped A Dual Red Pill And Got ' .. two[chance2] .. '!', 'xtc')
+	  elseif RemoveItem(src, "red_xtc3", 1) then
+		  AddItem(src, three[chance3], 1) 
+		  Log(GetName(source) .. ' Stamped A Triple Red Pill And Got ' .. three[chance3] .. '!', 'xtc')
+	  elseif RemoveItem(src, "red_xtc4", 1) then
+		  AddItem(src, four[chance4], 1) 
+		  Log(GetName(source) .. ' Stamped A Quad Red Pill And Got ' .. four[chance4] .. '!', 'xtc')
 	  else 
 		  Notifys('You Dont Have Unstamped red Pills', 'error')
 	  end
@@ -327,7 +223,7 @@ end)
 
 RegisterServerEvent('md-drugs:server:stamporange', function(num)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
+	local Player = getPlayer(src)
 	local one = {'orange_playboys', 'orange_aliens', 'orange_pl', 'orange_trolls', 'orange_cats'}
 	local chance = math.random(#one)
 	local two = {'orange_playboys2', 'orange_aliens2', 'orange_pl2', 'orange_trolls2', 'orange_cats2'}
@@ -337,20 +233,20 @@ RegisterServerEvent('md-drugs:server:stamporange', function(num)
 	local four = {'orange_playboys4', 'orange_aliens4', 'orange_pl4', 'orange_trolls4', 'orange_cats4'}
 	local chance4 = math.random(#one)
 	local playerPed = GetPlayerPed(source)
-	  if CheckDist(source, playerPed, Config.stamp[num]['loc']) then return end
+	  if CheckDist(source, Config.stamp[num]['loc']) then return end
   
-	  if Player.Functions.RemoveItem("orange_xtc", 1) then
-		  AddItem(one[chance], 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Single Orange Pill And Got ' .. one[chance] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("orange_xtc2", 1) then
-		  AddItem(two[chance2], 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Dual Orange Pill And Got ' .. two[chance2] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("orange_xtc3", 1) then
-		  AddItem(three[chance3], 1) 
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Triple Orange Pill And Got ' .. three[chance3] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("orange_xtc4", 1) then
-		  AddItem(four[chance4], 1) 
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Quad Orange Pill And Got ' .. four[chance4] .. '!', 'xtc')
+	  if RemoveItem(src, "orange_xtc", 1) then
+		  AddItem(src, one[chance], 1)
+		  Log(GetName(source) .. ' Stamped A Single Orange Pill And Got ' .. one[chance] .. '!', 'xtc')
+	  elseif RemoveItem(src, "orange_xtc2", 1) then
+		  AddItem(src, two[chance2], 1)
+		  Log(GetName(source) .. ' Stamped A Dual Orange Pill And Got ' .. two[chance2] .. '!', 'xtc')
+	  elseif RemoveItem(src, "orange_xtc3", 1) then
+		  AddItem(src, three[chance3], 1) 
+		  Log(GetName(source) .. ' Stamped A Triple Orange Pill And Got ' .. three[chance3] .. '!', 'xtc')
+	  elseif RemoveItem(src, "orange_xtc4", 1) then
+		  AddItem(src, four[chance4], 1) 
+		  Log(GetName(source) .. ' Stamped A Quad Orange Pill And Got ' .. four[chance4] .. '!', 'xtc')
 	  else 
 		  Notifys('You Dont Have Unstamped orange Pills', 'error')
 	  end
@@ -358,7 +254,7 @@ end)
 
 RegisterServerEvent('md-drugs:server:stampblue', function(num)
 	local src = source
-	local Player = QBCore.Functions.GetPlayer(src)
+	local Player = getPlayer(src)
 	local one = {'blue_playboys', 'blue_aliens', 'blue_pl', 'blue_trolls', 'blue_cats'}
 	local chance = math.random(#one)
 	local two = {'blue_playboys2', 'blue_aliens2', 'blue_pl2', 'blue_trolls2', 'blue_cats2'}
@@ -368,19 +264,19 @@ RegisterServerEvent('md-drugs:server:stampblue', function(num)
 	local four = {'blue_playboys4', 'blue_aliens4', 'blue_pl4', 'blue_trolls4', 'blue_cats4'}
 	local chance4 = math.random(#one)
 	local playerPed = GetPlayerPed(source)
-	  if CheckDist(source, playerPed, Config.stamp[num]['loc']) then return  end
-	  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Single Blue Pill And Got ' .. one[chance] .. '!', 'xtc')
-	  if Player.Functions.RemoveItem("blue_xtc", 1) then
-		  AddItem(one[chance], 1)
-	  elseif Player.Functions.RemoveItem("blue_xtc2", 1) then
-		  AddItem(two[chance2], 1)
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Dual Blue Pill And Got ' .. two[chance2] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("blue_xtc3", 1) then
-		  AddItem(three[chance3], 1) 
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Triple Blue Pill And Got ' .. three[chance3] .. '!', 'xtc')
-	  elseif Player.Functions.RemoveItem("blue_xtc4", 1) then
-		  AddItem(four[chance4], 1) 
-		  Log(Player.PlayerData.charinfo.firstname .. ' ' ..  Player.PlayerData.charinfo.lastname .. ' Stamped A Quad Blue Pill And Got ' .. four[chance4] .. '!', 'xtc')
+	  if CheckDist(source, Config.stamp[num]['loc']) then return  end
+	  Log(GetName(source) .. ' Stamped A Single Blue Pill And Got ' .. one[chance] .. '!', 'xtc')
+	  if RemoveItem(src, "blue_xtc", 1) then
+		  AddItem(src, one[chance], 1)
+	  elseif RemoveItem(src, "blue_xtc2", 1) then
+		  AddItem(src, two[chance2], 1)
+		  Log(GetName(source) .. ' Stamped A Dual Blue Pill And Got ' .. two[chance2] .. '!', 'xtc')
+	  elseif RemoveItem(src, "blue_xtc3", 1) then
+		  AddItem(src, three[chance3], 1) 
+		  Log(GetName(source) .. ' Stamped A Triple Blue Pill And Got ' .. three[chance3] .. '!', 'xtc')
+	  elseif RemoveItem(src, "blue_xtc4", 1) then
+		  AddItem(src, four[chance4], 1) 
+		  Log(GetName(source) .. ' Stamped A Quad Blue Pill And Got ' .. four[chance4] .. '!', 'xtc')
 	  else 
 		  Notifys('You Dont Have Unstamped blue Pills', 'error')
 	  end

shared/config.lua

@@ -1,6 +1,6 @@
 Config = {} --Ignore.
 
-Config.oxtarget = false --- turn to true if you use oxtarget
+Config.Target = 'ox' -- qb or ox
 Config.respawnTime = 150 -- Seconds
 Config.Fuel = "LegacyFuel" -- type the name of script you use i.e. ps-fuel, cdn-fuel, LegacyFuel
 Config.TierSystem = true -- allows for three tiers of certain drugs ( coke, heroin, crack, lsd)
@@ -13,14 +13,34 @@ Config.Tier2 = 300 -- amount to hit for level 3
 
 ---------------------------------- BRIDGE 
 Config.progressbartype = 'oxcir' -- either 'qb', 'oxcir', 'oxbar'
-Config.minigametype = 'ox' -- either 'ps' or 'ox' or 'none'
 Config.Notify = 'ox' -- -- either 'qb' or 'ox' or 'okok'
 Config.Phone = 'qb' -- either 'qb' or 'yflip' or 'qs'
 Config.Dispatch = 'ps' -- either 'ps', 'cd', 'core', 'aty'
 
+Config.Minigames = {
+    ps_circle =     {amount = 2,     speed = 8,},
+    ps_maze =       {timelimit = 15},
+    ps_scrambler =  {type = 'numeric', time = 15, mirrored = 0},
+    ps_var =        {numBlocks = 5, time = 10},
+    ps_thermite =   {time = 10, gridsize = 5, incorrect = 3},
+    ox =            {'easy', 'easy'},   --easy medium or hard each one corresponds to how many skillchecks and the difficulty
+    blcirprog =     {amount = 2, speed = 50},       -- speed = 1-100
+    blprog =        {amount = 1, speed = 50},       -- speed = 1-100
+    blkeyspam =     {amount = 1, difficulty = 50}, -- difficulty = 1-100
+    blkeycircle =   {amount = 1, difficulty = 50, keynumbers = 3},
+    blnumberslide = {amount = 1, difficulty = 50, keynumbers = 3},
+    blrapidlines =  {amount = 1, difficulty = 50, numberofline = 3},
+    blcircleshake = {amount = 1, difficulty = 50, stages = 3},
+    glpath =        {gridSize = 19,  lives = 3,     timelimit = 10000},
+    glspot =        {gridSize = 6, timeLimit = 999999, charSet = "alphabet", required = 10},
+    glmath =        {timeLimit = 300000},
+
+}
+Config.minigametype = 'ox' -- look above for options or choose none if you dont want any minigames 
+
 ------------- you can either set a gang or leave it blank, if blank it will autopopulate data to not require it :)
 ------------- Cocaine -- new animations require to be in a certain spot or they get fucky. uses bob74 ipl if you turn Config.FancyCokeAnims you can put it anywhere :) 
-Config.FancyCokeAnims = false -- if you want multi location this needs to be false
+Config.FancyCokeAnims = true -- if you want multi location this needs to be false
 
 Config.CokeTeleIn = vector3(198.16, -1276.92, 29.33)-- where you target to go inside
 
@@ -28,12 +48,14 @@ Config.CokeTeleOut = vector3(1088.81, -3187.57, -38.99) -- where you target to l
 
 Config.MakePowder = { -- where you chop your coca leaves to make powder
     {loc = vector3(1086.20, -3195.30, -39.20), l = 1.0, w = 1.0, rot = 45.0, gang = ""},
+    {loc = vector3(1090.15, -3199.5, -39.18), l = 1.0, w = 1.0, rot = 45.0, gang = ""},
+    {loc = vector3(1093.09, -3199.53, -39.05), l = 1.0, w = 1.0, rot = 45.0, gang = ""},
 }
 Config.CuttingCoke = { -- only active if Config.FancyCokeAnims = false
-    {loc = vector3(1095.66, -3195.4, -39.13), l = 1.0, w = 1.0, rot = 45.0, gang = ""},
+    {loc = vector3(1095.61, -3195.62, -39.13), l = 1.0, w = 1.0, rot = 45.0, gang = ""},
 }
 Config.BaggingCoke = { -- only active if Config.FancyCokeAnims = false
-    {loc = vector3(1100.34, -3199.44, -39.19), l = 1.0, w = 1.0, rot = 45.0, gang = ""},
+    {loc = vector3(1100.3, -3199.42, -39.19), l = 1.0, w = 1.0, rot = 45.0, gang = ""},
 }
 ---------------- Crack locations
 Config.makecrack = { -- make crack with baking soda with cut coke 1-3
@@ -99,7 +121,7 @@ Config.stamp = { --  where to stamp pills
 Config.buypress = vector3(845.82, -884.79, 25.18)--  Where you buy your presses
 
 ----- mescaline
-Config.DryOut = vector3(2622.6, 4222.57, 43.6) -- Place to dry out mescaline into usuable drug
+Config.DryOut = vector3(2638.22, 4237.93, 44.78) -- 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
 
 
@@ -112,7 +134,6 @@ Config.StartLoc = {
     vector3(-224.89, 6388.32, 31.59)
 }
 
-
 ---------- Pharma
 
 Config.FillPrescription = {---------- 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
@@ -120,48 +141,32 @@ Config.FillPrescription = {---------- this is where you want people to take thei
 }
 
 Config.PharmaJob = "ems" -- what TYPE role you need to be on to get the command
-
-
 -------------- weed
 Config.Teleout = vector3(1066.31, -3183.36, -39.16) -- where you target to tele in
 Config.Telein = vector3(244.74, 374.54, 105.74) -- where you target to tele out
 Config.MakeButter = vector3(1045.48, -3198.49, -38.22) -- where you make cannabutter and baked edibles
-Config.MakeOil = vector3(1038.90, -3198.66, -38.17-1) -- where you make shatter
-Config.WeedSaleman = vector4(1030.46, -3203.63, -38.2, 180.0)
+Config.MakeOil = vector3(1038.90, -3198.66, -38.17) -- where you make shatter
+Config.WeedSaleman = vector4(1030.77, -3203.18, -38.2, 262.37)
 
 Config.WeedDry = { -- where you dry leaves 
-    vector3(1043.0, -3191.59, -38.39),
-    vector3(1041.0, -3191.59, -38.39),
-    vector3(1045.0, -3191.59, -38.39),
-    vector3(1039.0, -3191.59, -38.39),
+    {loc = vector3(1043.0, -3191.59, -38.39),},
+    {loc = vector3(1041.0, -3191.59, -38.39),},
+    {loc = vector3(1045.0, -3191.59, -38.39),},
+    {loc = vector3(1039.0, -3191.59, -38.39),},
 }
 
 Config.Joblock = false -- if you want weed to be a job
 Config.weedjob = "" -- what the job name is
-Config.Weed = { --- this is the store for the weed ingridients
-    label = "Weed Shop",
-    slots = 8,
-    items = {
-        {name = "weedgrinder", 	price = 25, 	amount = 50, },
-		{name = "mdbutter", 	price = 25, 	amount = 50, },
-		{name = "flour", 		price = 25, 	amount = 50, },
-		{name = "chocolate",  	price = 25, 	amount = 50, },
-		{name = "butane", 		price = 25, 	amount = 50, },
-		{name = "butanetorch", 	price = 2, 		amount = 1000,},
-		{name = "dabrig", 		price = 2, 		amount = 1000,},
-		{name = "mdwoods", 		price = 2, 		amount = 1000,},	
-	}
-}
 
 ----------------- Wholesale
 Config.SuccessfulChance = 90 --- this is the chance of a Success wholesale 1-100
 Config.AlertPoliceWholesale = 90 -- 1-100 of how often it will alert police
 Config.WholesaleTimeout = 600 -- time in seconds to get to the location
-Config.PoliceCount = 2 -- Amount of police required
+Config.PoliceCount = 0 -- Amount of police required
 Config.Wcoke =  { min = 20, max = 60} -- pricings per item
-Config.Wcrack = { min = 20, max = 60}
-Config.Wlsd = { min = 20, max = 60}
-Config.WXTC = { min = 20, max = 60}
+Config.Wcrack = { min = 20, max = 60} -- pricings per item
+Config.Wlsd = { min = 20, max = 60} -- pricings per item
+Config.WXTC = { min = 20, max = 60} -- pricings per item
 
 
 --- travelling merchant
@@ -171,41 +176,13 @@ Config.Travellingmerchant = { ------------ these are the random locations the me
 	vector4(-1522.93, 1476.01, 111.45, 41.25),
 	vector4(-3278.98, 973.38, 5.35, 101.53),
 }
-Config.Items = { --- this is the store for the travelling merchant
-    items = {
-        [1] = {name = "tab_paper", 		 price = 50, 	amount = 50, 	},
-        [2] = {name = "bakingsoda", 	 price = 25, 	amount = 50, 	},
-		[3] = {name = "isosafrole", 	 price = 25, 	amount = 50, 	},
-		[4] = {name = "mdp2p", 			 price = 25, 	amount = 50, 	},
-		[5] = {name = "lysergic_acid",   price = 25, 	amount = 50, 	},
-		[6] = {name = "diethylamide",    price = 25, 	amount = 50, 	},
-		[7] = {name = "lockpick",  price = 2, 	amount = 1000, 	},
-		[8] = {name = "emptyvial", 		 price = 2, 	amount = 1000, 	},
-		[9] = {name = "needle", 		 price = 2, 	amount = 1000,	},
-		[10] = {name = "cokeburner", 	 price = 25, 	amount = 50, 	},
-		[11] = {name = "crackburner", 	 price = 2, 	amount = 50, 	},
-		[12] = {name = "lsdburner",		 price = 2, 	amount = 50, 	},
-		[13] = {name = "heroinburner", 	 price = 2, 	amount = 50, 	},
-		[14] = {name = "mdlean", 		 price = 50, 	amount = 50, 	},
-        [15] = {name = "weedgrinder", 	 price = 25, 	amount = 50, 	},
-		[16] = {name = "mdbutter", 		 price = 25, 	amount = 50, 	},
-		[17] = {name = "flour", 		 price = 25, 	amount = 50, 	},
-		[18] = {name = "chocolate",  	 price = 25, 	amount = 50, 	},
-		[19] = {name = "butane", 		 price = 25, 	amount = 50, 	},
-		[20] = {name = "butanetorch", 	 price = 2, 	amount = 1000, 	},
-		[21] = {name = "dabrig", 		 price = 2, 	amount = 1000, 	},
-		[22] = {name = "mdwoods", 		 price = 2, 	amount = 1000, 	},
-		[23] = {name = "leancup", 		 price = 25, 	amount = 50, 	},
-        [24] = {name = "xtcburner", 	 price = 25, 	amount = 50, 	},
-		
-	}
-}
+
 --------------------------------------- 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.truckspawn = vector4(1450.87, -1482.13, 63.22, 69.95) --- 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.TruckPrice = 500 -- amount the truck will cost to rent
 Config.OxyRunCompleteCash = 200 -- base price you get for completeing a run. 50% if the car needs to be ditched

shared/consumables.lua

@@ -1,130 +1,147 @@
-Consumables = {}
-Consumables.defaulttime = 4000
-Consumables.defaultanim = 'pflag2'
-Consumables.defaultprogresstext = 'Consuming ' -- it will always show the label of the item being used after what you put here, make sure to keep the space at the end :)
-Consumables.defaultstatval = 0
---[[
-    effect options
-    alien
-    ecstacy
-    meth
-    coke
-    trevor
-    none
-]]
-Consumables.Items = {
-    -- meth
-    ["methbags"] =                { time = 4000, effect = 'meth', anim = "smoke", progressbartext = "Smoking", status = 'thirst', statval = 10},
-    -- coke
-    ["cokebaggy"] =               {  anim = 'smell', time = 1000, effect = 'coke'},
-    ["cokebaggystagetwo"] =       {  anim = 'smell', time = 1000, effect = 'coke'},
-    ["cokebaggystagethree"] =     {  anim = 'smell', time = 1000, effect = 'coke'},
-    -- heroin
-    ["heroin_ready"]        =     {  anim = 'shootup', time = 1000, effect = 'ecstacy'},
-    ["heroin_readystagetwo"] =    {  anim = 'shootup', time = 1000, effect = 'ecstacy'},
-    ["heroin_readystagethree"] =  {  anim = 'shootup', time = 1000, effect = 'ecstacy'},
-    -- crack
-    ["baggedcracked"] =           {  anim = 'smell', time = 1000, effect = 'coke'},
-    ["baggedcrackedstagetwo"] =   {  anim = 'smell', time = 1000, effect = 'coke'},
-    ["baggedcrackedstagethree"] = {  anim = 'smell', time = 1000, effect = 'coke'},
-    -- xtc
-    ["white_playboys"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_playboys2"] =         {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_playboys3"] =         {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_playboys4"] =         {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_playboys"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_playboys2"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_playboys3"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_playboys4"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_playboys"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_playboys2"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_playboys3"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_playboys4"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_playboys"] =         {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_playboy2s"] =        {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_playboys3"] =        {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_playboys4"] =        {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_aliens"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_aliens2"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_aliens3"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_aliens4"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_aliens"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_aliens2"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_aliens3"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_aliens4"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_aliens"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_aliens3"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_aliens2"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_aliens4"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_aliens"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_aliens2"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_aliens3"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_aliens4"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_pl"] =                {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_pl2"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_pl3"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_pl4"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_pl"] =                 {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_pl2"] =                {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_pl3"] =                {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_pl4"] =                {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_pl"] =                  {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_pl2"] =                 {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_pl3"] =                 {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_pl4"] =                 {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_pl"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_pl2"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_pl3"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_pl4"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_trolls"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_trolls2"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_trolls3"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_trolls4"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_trolls"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_trolls2"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_trolls3"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_trolls4"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_trolls"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_trolls2"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_trolls3"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_trolls4"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_trolls"] =           {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_trolls2"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_trolls3"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_trolls4"] =          {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_cats2"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_cats3"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_cats4"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["white_cats"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_cats"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_cats3"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_cats2"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["blue_cats4"] =              {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_cats"] =                {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_cats2"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_cats3"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["red_cats4"] =               {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_cats"] =             {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_cats2"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_cats3"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    ["orange_cats4"] =            {  anim = 'edible', time = 1000, effect = 'ecstacy'},
-    -- weed
-    ["specialbrownie"] =          {  anim = 'edible',  effect = 'alien', status = 'hunger', statval = 10},
-    ["specialcookie"] =           {  anim = 'edible',  effect = 'alien', status = 'hunger', statval = 10},
-    ["specialchocolate"] =        {  anim = 'edible',  effect = 'alien', status = 'hunger', statval = 10},
-    ["specialmuffin"] =           {  anim = 'edible',  effect = 'alien', status = 'hunger', statval = 10},
-    ["blunt"] =                   {  anim = 'smokeweed', effect = 'alien'},
-    ["dextroblunts"] =            {  anim = 'smokeweed', effect = 'alien'},
-    ["leanblunts"] =              {  anim = 'smokeweed', effect = 'alien'},
-    ["chewyblunt"] =              {  anim = 'smokeweed', effect = 'alien'},
-    -- lean 
-    ["cupofdextro"] =             {  anim = 'cup', effect = 'alien'},
-    ["cupoflean"] =               {  anim = 'cup', effect = 'alien'},
-    --lsd
-    ["smiley_tabs"]  =            {  anim = 'edible', effect = 'trevor'},
-    ["wildcherry_tabs"]  =        {  anim = 'edible', effect = 'trevor'},
-    ["yinyang_tabs"]  =           {  anim = 'edible', effect = 'trevor'},
-    ["pineapple_tabs"] =          {  anim = 'edible', effect = 'trevor'}, 
-    ["bart_tabs"]  =              {  anim = 'edible', effect = 'trevor'},
-    ["gratefuldead_tabs"]  =      {  anim = 'edible', effect = 'trevor'},
-}
+Consumables = {}
+Consumables.defaulttime = 4000
+Consumables.defaultanim = 'pflag2'
+Consumables.defaultprogresstext = 'Consuming ' -- it will always show the label of the item being used after what you put here, make sure to keep the space at the end :)
+Consumables.defaultstatval = 0
+--[[
+    effect options
+    alien
+    ecstacy
+    meth
+    coke
+    trevor
+    none
+]]
+
+--[[
+add = {} 
+health = number -- amount of health to give
+stress = number -- number of stress to give 
+speed = number -- number of seconds you a fast boi
+hunger = number -- number of hunger to fill
+thirst = number -- same shit 
+strength = number -- how long you are strong boi
+
+]]
+Consumables.Items = {
+        -- meth
+    methbags =                { time = 4000, effect = 'meth', anim = "smoke", progressbartext = "Injesting", 
+                                        add = {health = -20, stress = -10, speed = 40, strength = 10, thirst = -30}},
+    cokebaggy =               { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }},
+    cokebaggystagetwo =       { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }},
+    cokebaggystagethree =     { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }},
+    -- heroin
+    heroin_ready        =     { anim = 'shootup', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    heroin_readystagetwo =    { anim = 'shootup', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    heroin_readystagethree =  { anim = 'shootup', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    -- crack
+    baggedcracked           = { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }},
+    baggedcrackedstagetwo   = { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }},
+    baggedcrackedstagethree = { anim = 'smell', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    -- xtc
+    white_playboys          = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_playboys2         = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_playboys3         = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_playboys4         = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_playboys           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_playboys2          = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_playboys3          = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_playboys4          = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_playboys            = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_playboys2           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_playboys3           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_playboys4           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_playboys         = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_playboy2s        = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_playboys3        = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_playboys4        = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_aliens            = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_aliens2           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_aliens3           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_aliens4           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_aliens             = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_aliens2            = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_aliens3            = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_aliens4            = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_aliens              = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_aliens3             = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_aliens2             = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_aliens4             = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_aliens           = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_aliens2          = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_aliens3          = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_aliens4          = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_pl                = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_pl2               = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_pl3               = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_pl4               = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_pl                 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_pl2                = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_pl3                = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_pl4                = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_pl                  = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_pl2                 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_pl3                 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_pl4                 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_pl               = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_pl2              = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_pl3              = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_pl4 =              { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_trolls =            { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_trolls2 =           { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_trolls3 =           { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_trolls4 =           { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_trolls =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_trolls2 =            { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_trolls3 =            { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_trolls4 =            { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_trolls =              { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_trolls2 =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_trolls3 =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_trolls4 =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_trolls =           { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_trolls2 =          { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_trolls3 =          { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_trolls4 =          { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_cats2 =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_cats3 =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_cats4 =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    white_cats =              { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_cats =               { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_cats3 =              { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_cats2 =              { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    blue_cats4 =              { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_cats =                { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_cats2 =               { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_cats3 =               { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    red_cats4 =               { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_cats =             { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_cats2 =            { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_cats3 =            { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    orange_cats4 =            { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }},
+    -- weed
+    specialbrownie =          { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }},
+    specialcookie =           { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }},
+    specialchocolate =        { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }},
+    specialmuffin =           { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }},
+    blunt =                   { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }},
+    dextroblunts =            { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }},
+    leanblunts =              { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }},
+    chewyblunt =              { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }},
+    -- lean 
+    cupofdextro =             { anim = 'cup', effect = 'alien', add = { stress = -10 }},
+    cupoflean =               { anim = 'cup', effect = 'alien', add = { stress = -10 }},
+    -- lsd
+    smiley_tabs  =            { anim = 'edible', effect = 'trevor', add = { stress = -10 }},
+    wildcherry_tabs  =        { anim = 'edible', effect = 'trevor', add = { stress = -10 }},
+    yinyang_tabs  =           { anim = 'edible', effect = 'trevor', add = { stress = -10 }},
+    pineapple_tabs =          { anim = 'edible', effect = 'trevor', add = { stress = -10 }},
+    bart_tabs  =              { anim = 'edible', effect = 'trevor', add = { stress = -10 }},
+    gratefuldead_tabs  =      { anim = 'edible', effect = 'trevor', add = { stress = -10 }},
+
+    -- pharma 
+    vicodin =                 { anim = 'pill', effect = 'none', add = { health = 20 }},
+    adderal =                 { anim = 'pill', effect = 'none', add = { stress = -20 }},
+    morphine =                { anim = 'pill', effect = 'none', add = { health = 40 }},
+    xanax =                   { anim = 'pill', effect = 'none', add = { stress = -40 }},
+}

shared/english.lua

@@ -1,5 +1,107 @@
 Lang = {}
 
+Lang.targets = {
+    coke = {
+        pick = 'Pick Cocaine',
+        cut = 'Cut Cocaine',
+        bag = 'Bag Cocaine',
+        enter = 'Enter Building',
+        exit = 'Exit Building',
+        chop = 'Chop Coca Leaves',
+        
+    },
+    CornerSell = {
+        sell = 'Sell %s Of %s For $%s',
+        deny = 'Deny Price'
+    },
+    crack = {
+        cook = 'Cook Crack',
+        bag = 'Bag Crack'
+    },
+    Delivery = {
+        Deliver = 'Deliver For %s',
+        open = 'Open %s Shop',
+        hand = 'Hand Over'
+    },
+    heroin = {
+        pick = 'Pick Poppies',
+        up = 'Pick Up Table',
+        dry = 'Dry Poppies',
+        cut = 'Cut Heroin',
+        cook = 'Cook Heroin',
+        kit = 'Buy Heroin Lab Kit',
+        clean = 'Clean Table',
+        fill = 'Fill Syringe',
+        vial = 'Make Vial',
+    },
+    lean = {
+        git = 'Get Task'
+    },
+    lsd = {
+        buy = 'Buy LSD Lab Kit',
+        heat = 'Heat Liquid',
+        refine = 'Refine Quality',
+        paper = 'Make Tab Paper',
+        back = 'Pick Up Lab Kit',
+        dab = 'Dab LSD on sheets',
+        clean = 'Clean Table',
+        lys = 'Steal Lysergic Acid',
+        die = 'Steal Diethylamide',
+        buyt = 'Buy Tabs',
+    },
+    mescaline = {
+        pick = 'Pick Cactus',
+        dry = 'Dry Out Cactus',
+    },
+    meth = {
+        bag = 'Bag Up Meth',
+        enter = 'Enter Buidling',
+        exit = 'Exit Building',
+        cook = 'Cook Meth',
+        tray = 'Grab Tray',
+        box = 'Box Up Meth',
+        adjust = 'Adjust Temperature',
+        eph = 'Steal Ephedrine',
+        ace = 'Steal Acetone',
+        mission = 'Get Mission',
+        stealfromcar = 'Steal From Car',
+    },
+    oxy = {
+        pack = 'Get Oxy Package',
+        talk = 'Talk To Buyer',
+        pay = 'Pay For Truck',
+    },
+    pha = {
+        fill = 'Fill Prescription',
+    },
+    shrooms = {
+        pick = 'Pick Shrooms',
+    },
+    travel = {
+        travel = 'Open Travelling Merchant',
+    },
+    xtc = {
+        iso = 'Steal Isosafrole',
+        mdp = 'Steal MDP2P',
+        raw = 'Make Raw XTC',
+        press = 'Buy XTC Press',
+        stamp = 'Stamp Pills',
+        make = 'Make XTC',
+        pick = 'Pick Up Press',
+    },
+    weed = {
+        pick = 'Pick Weed',
+        dry = 'Dry Weed',
+        dpick = 'Pick Dried Weed',
+        butt = 'Open Edible Menu',
+        oil = 'Make Oil'
+    },
+    Wholesale = {
+        talk = 'Talk To Buyer'
+    },
+    
+}
+
 Lang.Coke = { 
     -- client side progressbars
     picking = "Picking Leaves",
@@ -22,19 +124,24 @@ Lang.Crack = {
 }
 Lang.Cornerselling = {
     -- client side notifys
+    inveh = 'STRANGER DANGER, I WONT GET IN THE CAR WITH YOU',
     toofar = "To Far From Your Corner Homie",
-    inacar = " You Cant Sell While In A Car",
+    selling = 'Selling %s For $%s',
     deny = "Fuck That Offer",
     start = "Get That Paper",
     stop = "Lazy Ass Cant Even Sell Drugs",
     nodrugs = "What You Gonna sell? Air?",
     notcops = "Not Enough Cops",
+    no = 'You Cant Sell Drugs Here!',
     -- end client side notifys
     -- progressbars
     sell = "Selling Drugs",
 }
 Lang.Delivery = {
     -- client side
+    emailn = 'Not A Drug Dealer',
+    emailsub = 'Hurry Up And Get The Package To The Buyer',
+    emailcon = 'I Swear To God If It Doesnt Get There I Will Tell Your Mom You Said Fuck Just Bring %s Of %s',
     search = "Searching For A Delivery ...",
     none = "Nothing Close By",
     busy = "You Havent Even Finished The One I Told You Too",
@@ -70,7 +177,8 @@ Lang.Heroin = {
 Lang.Lean = {
     marked = ' Car Has Been Marked On Your Map',
     lean = 'You Got Purple Lean',
-    dextro = ' You Got Red Dextro'
+    dextro = ' You Got Red Dextro',
+    act = 'You Already Have A Lean Task',
 }
 
 Lang.lsd = {
@@ -85,6 +193,7 @@ Lang.lsd = {
     buypaper = 'Buying Tab Paper',
     buykit = 'Buying Lab Kit',
     place = 'Placing Table Down',
+    hav = 'You Already Have A Table',
     -- server
     lys = 'You Got Lysergic Acid',
     die = 'You Got Diethylamide',
@@ -109,7 +218,8 @@ Lang.meth = {
     ace = 'You Got Some Acetone',
     eph = 'You Got Some Ephedrine',
     mix = 'Adding Things To The Mix',
-    nobag = 'No Bags'
+    nobag = 'No Bags',
+    act = 'You Already Have A Meth Task',
 }
 
 Lang.oxy = {
@@ -148,6 +258,8 @@ Lang.Weed = {
     stovehot = 'Stove Is Too Hot Wait 30 Seconds To Cool Down',
     shat = 'Making Shatter',
     roll = 'Rolling Blunts',
+    wait = 'Wait A Little Bit For To Drive',
+    take = 'Taking Down The Weed',
     -- 
     nodry = 'You Need Wet Cannabis To Dry',
     noweed = 'Cant Roll A Blunt With Air',
@@ -162,6 +274,19 @@ Lang.xtc = {
     mdp2p = 'Stealing MDP2P',
     iso = 'Stealing Isosafrole',
     fail = 'Dude Its A Circle Not Rocket Science',
+    pickup = 'Picking Up The Press',
+    stamp = 'Stamping %s Pills',
+    buyp = "Buying Press",
     --
-    cash = 'I need 20k In Cash'
+    cash = 'I need 20k In Cash',
+    press = {
+        title = {single = 'Single Press', dual = 'Dual Press', triple = 'Triple Press', quad = 'Quad Press'},
+        des = {single ='Buy a single press for 20k', dual = '20 of each unstamped single stack pill and your single press ', 
+            triple = '50 of each unstamped dual stack pill and your dual press ', quad = '150 of each unstamped Triple stack pill and your triple press'
+        }
+    }
+}
+
+Lang.Wholesale = {
+    al = 'Already Called Someone!'
 }

shared/qbdrugsrewrite.lua

@@ -4,175 +4,147 @@ QBConfig = {}
 ------------ and changed the range a ped will walk up to you to be a bigger radius. 
 
 QBConfig.MinimumDrugSalePolice = 0
-QBConfig.MarkedBills = false -- if false on both options below then it auto converts selling to give cash
+QBConfig.MarkedBills = true -- if false on both options below then it auto converts selling to give cash
 QBConfig.CustomDirtyMoney = false
 QBConfig.CustomDirtyMoneyitem = ''
 
 QBConfig.DrugsPrice = {
     -- base qb
-    ["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},
-    -- coke
-    ["cokebaggystagetwo"] =         {min = 18, max = 40},
-	["cokebaggystagethree"] =       {min = 18, max = 40},
-    -- heroin 
-	["heroin_ready"] =              {min = 18, max = 40},
-	["heroin_readystagetwo"] =      {min = 18, max = 40},
-	["heroin_readystagethree"] =    {min = 18, max = 40},
-    -- crack
-	["baggedcracked"] =             {min = 18, max = 40},
-	["baggedcrackedstagetwo"] =     {min = 18, max = 40},
-	["baggedcrackedstagethree"] =   {min = 18, max = 40},
-    -- xtc 
-	["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},	
-    -- weed stuff
-	["blunts"] =                    {min = 18, max = 40},
-	["leanblunts"] =                {min = 18, max = 40},
-	["dextroblunts"] =              {min = 18, max = 40},
-    ["chewyblunt"] =                {min = 18, max = 40},
-    ["blunt"] =                     {min = 18, max = 40},
-    ["specialchocolate"] =          {min = 18, max = 40},
-    ["specialbrownie"] =            {min = 18, max = 40},
-    ["specialcookie"] =             {min = 18, max = 40},
-    ["specialmuffin"] =             {min = 18, max = 40},
-	["shatter"] =                   {min = 18, max = 40},
-	["ciggie"] =                    {min = 18, max = 40},
-    -- meth
-	["methbags"] =                  {min = 18, max = 40},	
-    -- mescaline
-	["driedmescaline"] =            {min = 18, max = 40},
-	-- shrooms
-	["shrooms"] =                   {min = 18, max = 40},
-    -- LSD
-	["gratefuldead_tabs"] =         {min = 18, max = 40},
-	["bart_tabs"] =                 {min = 18, max = 40},
-	["pineapple_tabs"] =            {min = 18, max = 40},
-	["yinyang_tabs"] =              {min = 18, max = 40},
-	["wildcherry_tabs"] =           {min = 18, max = 40},	
-	["smiley_tabs"] =               {min = 18, max = 40},
+    ["weed_white-widow"] =          {rep = 1,min = 15, max = 24 },
+    ["weed_og-kush"] =              {rep = 1,min = 15, max = 28 },
+    ["weed_skunk"] =                {rep = 1,min = 15, max = 31 },
+    ["weed_amnesia"] =              {rep = 1,min = 18, max = 34 },
+    ["weed_purple-haze"] =          {rep = 1,min = 18, max = 37},
+    ["weed_ak47"] =                 {rep = 1,min = 18, max = 40},
+    ["crack_baggy"] =               {rep = 1,min = 18, max = 34},
+    ["cokebaggy"] =                 {rep = 1,min = 18, max = 37},
+    -- cokerep = 1,
+    ["cokebaggystagetwo"] =         {rep = 1,min = 18, max = 40},
+	["cokebaggystagethree"] =       {rep = 1,min = 18, max = 40},
+    -- heroin rep = 1,
+	["heroin_ready"] =              {rep = 1,min = 18, max = 40},
+	["heroin_readystagetwo"] =      {rep = 1,min = 18, max = 40},
+	["heroin_readystagethree"] =    {rep = 1,min = 18, max = 40},
+    -- crackrep = 1,
+	["baggedcracked"] =             {rep = 1,min = 18, max = 40},
+	["baggedcrackedstagetwo"] =     {rep = 1,min = 18, max = 40},
+	["baggedcrackedstagethree"] =   {rep = 1,min = 18, max = 40},
+    -- xtc rep = 1,
+	["white_playboys"] =            {rep = 1,min = 18, max = 40},
+	["white_playboys2"] =           {rep = 1,min = 18, max = 40},
+	["white_playboys3"] =           {rep = 1,min = 18, max = 40},
+	["white_playboys4"] =           {rep = 1,min = 18, max = 40},
+	["blue_playboys"] =             {rep = 1,min = 18, max = 40},
+	["blue_playboys2"] =            {rep = 1,min = 18, max = 40},
+	["blue_playboys3"] =            {rep = 1,min = 18, max = 40},
+	["blue_playboys4"] =            {rep = 1,min = 18, max = 40},
+	["red_playboys"] =              {rep = 1,min = 18, max = 40},
+	["red_playboys2"] =             {rep = 1,min = 18, max = 40},
+	["red_playboys3"] =             {rep = 1,min = 18, max = 40},
+	["red_playboys4"] =             {rep = 1,min = 18, max = 40},
+	["orange_playboys"] =           {rep = 1,min = 18, max = 40},
+	["orange_playboys2"] =          {rep = 1,min = 18, max = 40},
+	["orange_playboys3"] =          {rep = 1,min = 18, max = 40},
+	["orange_playboys4"] =          {rep = 1,min = 18, max = 40},
+	["white_aliens"] =              {rep = 1,min = 18, max = 40},
+	["white_aliens2"] =             {rep = 1,min = 18, max = 40},
+	["white_aliens3"] =             {rep = 1,min = 18, max = 40},
+	["white_aliens4"] =             {rep = 1,min = 18, max = 40},
+	["blue_aliens"] =               {rep = 1,min = 18, max = 40},
+	["blue_aliens2"] =              {rep = 1,min = 18, max = 40},
+	["blue_aliens3"] =              {rep = 1,min = 18, max = 40},
+	["blue_aliens4"] =              {rep = 1,min = 18, max = 40},
+	["red_aliens"] =                {rep = 1,min = 18, max = 40},
+	["red_aliens2"] =               {rep = 1,min = 18, max = 40},
+	["red_aliens3"] =               {rep = 1,min = 18, max = 40},
+	["red_aliens4"] =               {rep = 1,min = 18, max = 40},
+	["orange_aliens"] =             {rep = 1,min = 18, max = 40},
+	["orange_aliens2"] =            {rep = 1,min = 18, max = 40},
+	["orange_aliens3"] =            {rep = 1,min = 18, max = 40},
+	["orange_aliens4"] =            {rep = 1,min = 18, max = 40},
+	["white_pl"] =                  {rep = 1,min = 18, max = 40},
+	["white_pl2"] =                 {rep = 1,min = 18, max = 40},
+	["white_pl3"] =                 {rep = 1,min = 18, max = 40},
+	["white_pl4"] =                 {rep = 1,min = 18, max = 40},
+	["blue_pl"] =                   {rep = 1,min = 18, max = 40},
+	["blue_pl2"] =                  {rep = 1,min = 18, max = 40},
+	["blue_pl3"] =                  {rep = 1,min = 18, max = 40},
+	["blue_pl4"] =                  {rep = 1,min = 18, max = 40},
+	["red_pl"] =                    {rep = 1,min = 18, max = 40},
+	["red_pl2"] =                   {rep = 1,min = 18, max = 40},
+	["red_pl3"] =                   {rep = 1,min = 18, max = 40},
+	["red_pl4"] =                   {rep = 1,min = 18, max = 40},
+	["orange_pl"] =                 {rep = 1,min = 18, max = 40},
+	["orange_pl2"] =                {rep = 1,min = 18, max = 40},
+	["orange_pl3"] =                {rep = 1,min = 18, max = 40},
+	["orange_pl4"] =                {rep = 1,min = 18, max = 40},
+	["white_trolls"] =              {rep = 1,min = 18, max = 40},
+	["white_trolls2"] =             {rep = 1,min = 18, max = 40},
+	["white_trolls3"] =             {rep = 1,min = 18, max = 40},
+	["white_trolls4"] =             {rep = 1,min = 18, max = 40},
+	["blue_trolls"] =               {rep = 1,min = 18, max = 40},
+	["blue_trolls2"] =              {rep = 1,min = 18, max = 40},
+	["blue_trolls3"] =              {rep = 1,min = 18, max = 40},
+	["blue_trolls4"] =              {rep = 1,min = 18, max = 40},
+	["red_trolls"] =                {rep = 1,min = 18, max = 40},
+	["red_trolls2"] =               {rep = 1,min = 18, max = 40},
+	["red_trolls3"] =               {rep = 1,min = 18, max = 40},
+	["red_trolls4"] =               {rep = 1,min = 18, max = 40},
+	["orange_trolls"] =             {rep = 1,min = 18, max = 40},
+	["orange_trolls2"] =            {rep = 1,min = 18, max = 40},
+	["orange_trolls3"] =            {rep = 1,min = 18, max = 40},
+	["orange_trolls4"] =            {rep = 1,min = 18, max = 40},
+	["white_cats"] =                {rep = 1,min = 18, max = 40},
+	["white_cats2"] =               {rep = 1,min = 18, max = 40},
+	["white_cats3"] =               {rep = 1,min = 18, max = 40},
+	["white_cats4"] =               {rep = 1,min = 18, max = 40},
+	["blue_cats"] =                 {rep = 1,min = 18, max = 40},
+	["blue_cats2"] =                {rep = 1,min = 18, max = 40},
+	["blue_cats3"] =                {rep = 1,min = 18, max = 40},
+	["blue_cats4"] =                {rep = 1,min = 18, max = 40},
+	["red_cats"] =                  {rep = 1,min = 18, max = 40},
+	["red_cats2"] =                 {rep = 1,min = 18, max = 40},
+	["red_cats3"] =                 {rep = 1,min = 18, max = 40},
+	["red_cats4"] =                 {rep = 1,min = 18, max = 40},
+	["orange_cats"] =               {rep = 1,min = 18, max = 40},
+	["orange_cats2"] =              {rep = 1,min = 18, max = 40},
+	["orange_cats3"] =              {rep = 1,min = 18, max = 40},
+	["orange_cats4"] =              {rep = 1,min = 18, max = 40},	
+    -- weed stuffrep = 1,
+	["blunts"] =                    {rep = 1,min = 18, max = 40},
+	["leanblunts"] =                {rep = 1,min = 18, max = 40},
+	["dextroblunts"] =              {rep = 1,min = 18, max = 40},
+    ["chewyblunt"] =                {rep = 1,min = 18, max = 40},
+    ["blunt"] =                     {rep = 1,min = 18, max = 40},
+    ["specialchocolate"] =          {rep = 1,min = 18, max = 40},
+    ["specialbrownie"] =            {rep = 1,min = 18, max = 40},
+    ["specialcookie"] =             {rep = 1,min = 18, max = 40},
+    ["specialmuffin"] =             {rep = 1,min = 18, max = 40},
+	["shatter"] =                   {rep = 1,min = 18, max = 40},
+	["ciggie"] =                    {rep = 1,min = 18, max = 40},
+    -- methrep = 1,
+	["methbags"] =                  {rep = 1,min = 18, max = 40},	
+    -- mescalinerep = 1,
+	["driedmescaline"] =            {rep = 1,min = 18, max = 40},
+	-- shroomsrep = 1,
+	["shrooms"] =                   {rep = 1,min = 18, max = 40},
+    -- LSDrep = 1,
+	["gratefuldead_tabs"] =         {rep = 1,min = 18, max = 40},
+	["bart_tabs"] =                 {rep = 1,min = 18, max = 40},
+	["pineapple_tabs"] =            {rep = 1,min = 18, max = 40},
+	["yinyang_tabs"] =              {rep = 1,min = 18, max = 40},
+	["wildcherry_tabs"] =           {rep = 1,min = 18, max = 40},	
+	["smiley_tabs"] =               {rep = 1,min = 18, max = 40},
 	-- lean
-    ["cupoflean"] =                 {min = 18, max = 40},
-    ["cupofdextro"] =                 {min = 18, max = 40},
+    ["cupoflean"] =                 {rep = 1,min = 18, max = 40},
+    ["cupofdextro"] =               {rep = 1,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?
-    QBConfig.Dealers = {}
-
-
-    -- Shop QBConfig
-QBConfig.Products = {
-        [1] = {name = "weed_white-widow_seed",  price = 15, amount = 150,  minrep = 0},
-        [2] = {name = "weed_skunk_seed", 		price = 15, amount = 150,  minrep = 0},
-        [3] = {name = "weed_purple-haze_seed",	price = 15, amount = 150,  minrep = 0},
-		[4] = {name = "weed_og-kush_seed", 	    price = 15, amount = 150,  minrep = 0},
-		[5] = {name = "weed_amnesia_seed", 		price = 15, amount = 150,  minrep = 0},
-}
-
-QBConfig.ProductsStupidNameRewrite = {
-        [1] = {name = "weed_whitewidow_seed",   price = 15, amount = 150, minrep = 0},
-        [2] = {name = "weed_skunk_seed", 		price = 15, amount = 150, minrep = 0},
-        [3] = {name = "weed_purplehaze_seed",	price = 15, amount = 150, minrep = 0},
-		[4] = {name = "weed_ogkush_seed", 	    price = 15, amount = 150, minrep = 0},
-		[5] = {name = "weed_amnesia_seed", 		price = 15, amount = 150, minrep = 0},
-}
-
-QBConfig.UseMarkedBills = false -- true for marked bills, false for cash
-QBConfig.DeliveryRepGain = 1 -- amount of rep gained per delivery
-QBConfig.DeliveryRepLoss = 1 -- amount of rep lost if delivery wrong or late
-QBConfig.PoliceDeliveryModifier = 2 -- amount to multiply active cop count by
-QBConfig.WrongAmountFee = 2 -- divide the payout by this value for wrong delivery amount
-QBConfig.OverdueDeliveryFee = 4 -- divide the payout by this value for overdue delivery
+QBConfig.Dealers = {}
 
 QBConfig.DeliveryItems = {
-   [1] = {    ["item"] = "weed_brick",    ["minrep"] = 0,    ['payout'] = 1000},
-   [2] = {    ["item"] = "coke_brick",    ["minrep"] = 0,    ['payout'] = 1000},
+    {    item = "weed_brick",    minrep = 0,    payout = {min = 10, max = 50}},
+    {    item = "coke_brick",    minrep = 0,    payout = {min = 10, max = 50}},
 }
 
 QBConfig.DeliveryLocations = {
@@ -257,3 +229,15 @@ QBConfig.DeliveryLocations = {
     [79] = {    ["label"] = "Bahama Mamas",             ["coords"] = vector3(-1383.1, -639.99, 28.67),},
  }
 
+QBConfig.NoSellZones = {
+    {loc = vector3(445.11, -991.3, 30.69), width = 10.0, length = 10.0, height = 10.0, rot = 180.0},
+}
+QBConfig.SellLevel = {
+   {price = 0.5, minrep = 0,    maxrep = 240,  label = 'Rookie'},
+   {price = 1.0, minrep = 240,  maxrep = 600,  label = 'Corner Boy'},
+   {price = 1.1, minrep = 600,  maxrep = 1200, label = 'Corner Man'},
+   {price = 1.2, minrep = 1200, maxrep = 1800, label = 'Dope Peddler'},
+   {price = 1.3, minrep = 1800, maxrep = 2400, label = 'Drug Supplier'},
+   {price = 1.5, minrep = 2400, maxrep = 4800, label = 'Drug Pusher'},
+   {price = 1.75, minrep = 4800, maxrep = 99999999999999, label = 'Drug Lord'},
+}

test.sql

@@ -0,0 +1,19 @@
+
+CREATE TABLE IF NOT EXISTS `deliveriesdealer` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `cid` varchar(50) NOT NULL,
+  `itemdata` varchar(50) NOT NULL,
+  `timestart` varchar(50) NOT NULL,
+  `timestop` varchar(50) DEFAULT NULL,
+  `maxtime` varchar(50) NOT NULL,
+  `location` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
+
+CREATE TABLE IF NOT EXISTS `drugrep` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `cid` varchar(50) DEFAULT NULL,
+  `drugrep` varchar(255) DEFAULT NULL,
+  `name` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;

version.txt

@@ -1,2 +1,2 @@
-3.5.9
+3.8.0