From 7b80ec622569b6c5b7f1d3f2c08c8d0b61e3e605 Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Mon, 25 Apr 2022 04:10:00 -0400 Subject: [PATCH 1/7] Code clean up --- client/coke.lua | 52 +------------------------------------------------ 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/client/coke.lua b/client/coke.lua index 2c2878e..a216c75 100644 --- a/client/coke.lua +++ b/client/coke.lua @@ -330,56 +330,6 @@ AddEventHandler('qb-drugprocessing:pickCocaLeaves', function() end) ---[[Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - local nearbyObject, nearbyID - - for i=1, #CocaPlants, 1 do - if GetDistanceBetweenCoords(coords, GetEntityCoords(CocaPlants[i]), false) < 1 then - nearbyObject, nearbyID = CocaPlants[i], i - end - end - - if nearbyObject and IsPedOnFoot(playerPed) then - - if not isPickingUp then - QBCore.Functions.Draw2DText(0.5, 0.88, 'Press [~g~ E ~w~] to pick cocaine leaves', 0.5) - end - - if IsControlJustReleased(0, 38) and not isPickingUp then - isPickingUp = true - TaskStartScenarioInPlace(playerPed, 'world_human_gardener_plant', 0, false) - - QBCore.Functions.Progressbar("search_register", "Picking cocaine leaves..", 10000, false, true, { - disableMovement = true, - disableCarMovement = true, - disableMouse = false, - disableCombat = true, - }, {}, {}, {}, function() -- Done - ClearPedTasks(PlayerPedId()) - SetEntityAsMissionEntity(nearbyObject, false, true) - DeleteObject(nearbyObject) - - table.remove(CocaPlants, nearbyID) - spawnedCocaLeaf = spawnedCocaLeaf - 1 - - TriggerServerEvent('qb-drugtrafficking:pickedUpCocaLeaf') - - end, function() - ClearPedTasks(PlayerPedId()) - end) - - isPickingUp = false - end - else - Citizen.Wait(500) - end - end -end)]]-- - AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then for k, v in pairs(CocaPlants) do @@ -490,4 +440,4 @@ RegisterCommand('propfix', function() DeleteEntity(v) end end -end) \ No newline at end of file +end) From d09e785ad9b5d5a2ee79a211e9c1c567f0000fec Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Mon, 25 Apr 2022 04:15:24 -0400 Subject: [PATCH 2/7] Suffix change Changed from qb to ps --- README.md | 11 +----- client/chemicals.lua | 58 ++++++++++++++--------------- client/heroin.lua | 8 ++-- client/hydrochloricacid.lua | 8 ++-- client/lsd.lua | 14 +++---- client/meth.lua | 50 ++++++++++++------------- client/sodiumhydroxide.lua | 8 ++-- client/sulfuricacid.lua | 8 ++-- client/target.lua | 74 ++++++++++++++++++------------------- client/weed.lua | 18 ++++----- server/chemicals.lua | 22 +++++------ server/coke.lua | 22 +++++------ server/heroin.lua | 14 +++---- server/lsd.lua | 14 +++---- server/meth.lua | 42 ++++++++++----------- server/weed.lua | 20 +++++----- 16 files changed, 191 insertions(+), 200 deletions(-) diff --git a/README.md b/README.md index 89f0441..e8fb59f 100644 --- a/README.md +++ b/README.md @@ -40,18 +40,9 @@ https://streamable.com/0pcjlt qb-inventory > html > images -# Helpful Triggers: - -* "qb-drugtrafficking:chemicalmenu" - Open Chemical Menu -* "qb-drugtrafficking:hydrochloric_acid" - Process Hydrochloric Acid -* "qb-drugtrafficking:sodium_hydroxide" - Process Sodium Hydroxide -* "qb-drugtrafficking:sulfuric_acid" - Process Sulfuric Acid -* "qb-drugtrafficking:lsa" - Process LSA - - # Dependencies * qb-target - https://github.com/BerkieBb/qb-target * qb-menu - https://github.com/qbcore-framework/qb-menu # Original Repo -https://github.com/DoPeMan17/esx_drugs +https://github.com/DoPeMan17/esx_drugs \ No newline at end of file diff --git a/client/chemicals.lua b/client/chemicals.lua index 5e3981f..40a4c8f 100644 --- a/client/chemicals.lua +++ b/client/chemicals.lua @@ -1,4 +1,4 @@ -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() local SpawnedChemicals = 0 local Chemicals = {} @@ -37,7 +37,7 @@ end) QBCore.Functions.DrawText3D(pos.x, pos.y, pos.z, "~g~E~w~ - Open chemical menu") if IsControlJustReleased(0, Keys['E']) then - TriggerEvent('qb-drugtrafficking:chemicalmenu') + TriggerEvent('ps-drugtrafficking:chemicalmenu') end else Citizen.Wait(5500) @@ -48,9 +48,9 @@ end)]]-- -- Chemical Menu Trigger & Menu Button Triggers -- -RegisterNetEvent('qb-drugtrafficking:chemicalmenu', function() +RegisterNetEvent('ps-drugtrafficking:chemicalmenu', function() createChemicalMenu() - exports['qb-menu']:openMenu(chemMenu) + exports['ps-menu']:openMenu(chemMenu) end) function createChemicalMenu() @@ -64,7 +64,7 @@ function createChemicalMenu() txt = "x1 Chemicals", params = { isServer = false, - event = "qb-drugtrafficking:hydrochloric_acid", + event = "ps-drugtrafficking:hydrochloric_acid", } }, { @@ -72,7 +72,7 @@ function createChemicalMenu() txt = "x1 Chemicals", params = { isServer = false, - event = "qb-drugtrafficking:sodium_hydroxide", + event = "ps-drugtrafficking:sodium_hydroxide", } }, { @@ -80,7 +80,7 @@ function createChemicalMenu() txt = "x1 Chemicals", params = { isServer = false, - event = "qb-drugtrafficking:sulfuric_acid", + event = "ps-drugtrafficking:sulfuric_acid", } }, { @@ -88,7 +88,7 @@ function createChemicalMenu() txt = "x1 Chemicals", params = { isServer = false, - event = "qb-drugtrafficking:lsa", + event = "ps-drugtrafficking:lsa", } }, { @@ -96,17 +96,17 @@ function createChemicalMenu() txt = "Close Menu", params = { isServer = false, - event = exports['qb-menu']:closeMenu(), + event = exports['ps-menu']:closeMenu(), } }, } - exports['qb-menu']:openMenu(chemMenu) + exports['ps-menu']:openMenu(chemMenu) end -------------------------------------------------------------------- -RegisterNetEvent("qb-drugtrafficking:hydrochloric_acid") -AddEventHandler("qb-drugtrafficking:hydrochloric_acid", function() +RegisterNetEvent("ps-drugtrafficking:hydrochloric_acid") +AddEventHandler("ps-drugtrafficking:hydrochloric_acid", function() ped = PlayerPedId(); QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) if result then @@ -117,8 +117,8 @@ AddEventHandler("qb-drugtrafficking:hydrochloric_acid", function() end, 'chemicals') end) -RegisterNetEvent("qb-drugtrafficking:lsa") -AddEventHandler("qb-drugtrafficking:lsa", function() +RegisterNetEvent("ps-drugtrafficking:lsa") +AddEventHandler("ps-drugtrafficking:lsa", function() ped = PlayerPedId(); QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) if result then @@ -141,7 +141,7 @@ function process_lsa() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:process_lsa') + TriggerServerEvent('ps-drugtrafficking:process_lsa') local timeLeft = Config.Delays.thionylchlorideProcessing / 1000 @@ -150,7 +150,7 @@ function process_lsa() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -162,8 +162,8 @@ function process_lsa() isProcessing = false end -RegisterNetEvent("qb-drugtrafficking:sulfuric_acid") -AddEventHandler("qb-drugtrafficking:sulfuric_acid", function() +RegisterNetEvent("ps-drugtrafficking:sulfuric_acid") +AddEventHandler("ps-drugtrafficking:sulfuric_acid", function() ped = PlayerPedId(); QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) if result then @@ -174,8 +174,8 @@ AddEventHandler("qb-drugtrafficking:sulfuric_acid", function() end, 'chemicals') end) -RegisterNetEvent("qb-drugtrafficking:sodium_hydroxide") -AddEventHandler("qb-drugtrafficking:sodium_hydroxide", function() +RegisterNetEvent("ps-drugtrafficking:sodium_hydroxide") +AddEventHandler("ps-drugtrafficking:sodium_hydroxide", function() ped = PlayerPedId(); QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) if result then @@ -198,7 +198,7 @@ function process_sulfuric_acid() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processprocess_sulfuric_acid') + TriggerServerEvent('ps-drugtrafficking:processprocess_sulfuric_acid') local timeLeft = Config.Delays.thionylchlorideProcessing / 1000 @@ -207,7 +207,7 @@ function process_sulfuric_acid() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -231,7 +231,7 @@ function process_sodium_hydroxide() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processsodium_hydroxide') + TriggerServerEvent('ps-drugtrafficking:processsodium_hydroxide') local timeLeft = Config.Delays.thionylchlorideProcessing / 1000 @@ -240,7 +240,7 @@ function process_sodium_hydroxide() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -264,7 +264,7 @@ function process_hydrochloric_acid() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processHydrochloric_acid') + TriggerServerEvent('ps-drugtrafficking:processHydrochloric_acid') local timeLeft = Config.Delays.thionylchlorideProcessing / 1000 @@ -273,7 +273,7 @@ function process_hydrochloric_acid() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -286,8 +286,8 @@ function process_hydrochloric_acid() end -RegisterNetEvent("qb-drugtrafficking:chemicals") -AddEventHandler("qb-drugtrafficking:chemicals", function() +RegisterNetEvent("ps-drugtrafficking:chemicals") +AddEventHandler("ps-drugtrafficking:chemicals", function() Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) @@ -316,7 +316,7 @@ AddEventHandler("qb-drugtrafficking:chemicals", function() table.remove(Chemicals, nearbyID) SpawnedChemicals = SpawnedChemicals - 1 - TriggerServerEvent('qb-drugtrafficking:pickedUpChemicals') + TriggerServerEvent('ps-drugtrafficking:pickedUpChemicals') end, function() ClearPedTasks(PlayerPedId()) diff --git a/client/heroin.lua b/client/heroin.lua index 24b1491..ede352e 100644 --- a/client/heroin.lua +++ b/client/heroin.lua @@ -1,7 +1,7 @@ local spawnedPoppys = 0 local PoppyPlants = {} local isPickingUp, isProcessing = false, false -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() Citizen.CreateThread(function() @@ -59,7 +59,7 @@ function ProcessHeroin() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processPoppyResin') + TriggerServerEvent('ps-drugtrafficking:processPoppyResin') local timeLeft = Config.Delays.HeroinProcessing / 1000 @@ -68,7 +68,7 @@ function ProcessHeroin() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.HeroinProcessing.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -116,7 +116,7 @@ Citizen.CreateThread(function() table.remove(PoppyPlants, nearbyID) spawnedPoppys = spawnedPoppys - 1 - TriggerServerEvent('qb-drugtrafficking:pickedUpPoppy') + TriggerServerEvent('ps-drugtrafficking:pickedUpPoppy') end, function() ClearPedTasks(PlayerPedId()) diff --git a/client/hydrochloricacid.lua b/client/hydrochloricacid.lua index 597a003..65c4af6 100644 --- a/client/hydrochloricacid.lua +++ b/client/hydrochloricacid.lua @@ -1,6 +1,6 @@ local spawnedHydrochloricAcidBarrels = 0 local HydrochloricAcidBarrels = {} -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() Citizen.CreateThread(function() while true do @@ -17,8 +17,8 @@ Citizen.CreateThread(function() end) -RegisterNetEvent("qb-drugtrafficking:client:hydrochloricacid") -AddEventHandler("qb-drugtrafficking:client:hydrochloricacid", function() +RegisterNetEvent("ps-drugtrafficking:client:hydrochloricacid") +AddEventHandler("ps-drugtrafficking:client:hydrochloricacid", function() Citizen.Wait(0) local playerPed = PlayerPedId() @@ -48,7 +48,7 @@ AddEventHandler("qb-drugtrafficking:client:hydrochloricacid", function() table.remove(HydrochloricAcidBarrels, nearbyID) spawnedHydrochloricAcidBarrels = spawnedHydrochloricAcidBarrels - 1 - TriggerServerEvent('qb-drugtrafficking:pickedUpHydrochloricAcid') + TriggerServerEvent('ps-drugtrafficking:pickedUpHydrochloricAcid') end, function() ClearPedTasks(PlayerPedId()) diff --git a/client/lsd.lua b/client/lsd.lua index afc570f..8b285e6 100644 --- a/client/lsd.lua +++ b/client/lsd.lua @@ -1,5 +1,5 @@ local isPickingUp, isProcessing, requiredItemsShowed, hasitem1, hasitem2 = false, false, false, false, false -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() Citizen.CreateThread(function() while true do @@ -52,7 +52,7 @@ function Processlsd() disableCombat = true, disableKeyboard = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:Processlsd') + TriggerServerEvent('ps-drugtrafficking:Processlsd') local timeLeft = Config.Delays.lsdProcessing / 1000 @@ -62,7 +62,7 @@ function Processlsd() if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.lsdProcessing.coords, false) > 5 then QBCore.Functions.Notify('The processing has been canceled due to you abandoning the area') - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -76,7 +76,7 @@ end Citizen.CreateThread(function() - exports['qb-target']:AddBoxZone("thychloride", vector3(-679.77, 5800.7, 17.33), 1, 1, { + exports['ps-target']:AddBoxZone("thychloride", vector3(-679.77, 5800.7, 17.33), 1, 1, { name="thychloride", heading=340.0, debugPoly=false, @@ -86,7 +86,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-crafting:opencraftingtable", + event = "ps-crafting:opencraftingtable", icon = "fas fa-biohazard", label = "Process Thionyl Chloride", }, @@ -147,7 +147,7 @@ function Processthionylchloride() disableCombat = true, disableKeyboard = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processThionylChloride') + TriggerServerEvent('ps-drugtrafficking:processThionylChloride') local timeLeft = Config.Delays.thionylchlorideProcessing / 1000 @@ -157,7 +157,7 @@ function Processthionylchloride() if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.thionylchlorideProcessing.coords, false) > 5 then QBCore.Functions.Notify('The processing has been canceled due to you abandoning the area') - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end diff --git a/client/meth.lua b/client/meth.lua index a9110d1..db2c650 100644 --- a/client/meth.lua +++ b/client/meth.lua @@ -1,6 +1,6 @@ local isProcessing, isTempChangeU, isTempChangeD, isBagging, hasitem1, hasitem2 = false, false, false, false, false, false local Methlab = false -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() --[[Citizen.CreateThread(function() while true do @@ -49,8 +49,8 @@ local QBCore = exports['qb-core']:GetCoreObject() end end)]]-- -RegisterNetEvent('qb-drugprocessing:ProcessChemicals') -AddEventHandler('qb-drugprocessing:ProcessChemicals', function() +RegisterNetEvent('ps-drugprocessing:ProcessChemicals') +AddEventHandler('ps-drugprocessing:ProcessChemicals', function() local coords = GetEntityCoords(PlayerPedId(source)) if GetDistanceBetweenCoords(coords, Config.CircleZones.MethProcessing.coords, true) < 5 then @@ -92,8 +92,8 @@ AddEventHandler('qb-drugprocessing:ProcessChemicals', function() end end) -RegisterNetEvent('qb-drugprocessing:ChangeTemp') -AddEventHandler('qb-drugprocessing:ChangeTemp', function() +RegisterNetEvent('ps-drugprocessing:ChangeTemp') +AddEventHandler('ps-drugprocessing:ChangeTemp', function() if not isTempChangeU then exports["memorygame"]:thermiteminigame(6, 3, 5, 10, function() -- success @@ -103,16 +103,16 @@ AddEventHandler('qb-drugprocessing:ChangeTemp', function() end, function() -- failure print("failure") - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') - TriggerServerEvent('qb-drugtrafficking:processFailUp') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:processFailUp') end) else QBCore.Functions.Notify('Temperature is Already Hot Enough', 'error') end end) -RegisterNetEvent('qb-drugprocessing:ChangeTemp2') -AddEventHandler('qb-drugprocessing:ChangeTemp2', function() +RegisterNetEvent('ps-drugprocessing:ChangeTemp2') +AddEventHandler('ps-drugprocessing:ChangeTemp2', function() if not isTempChangeD then exports["memorygame"]:thermiteminigame(6, 3, 5, 10, function() -- success @@ -122,16 +122,16 @@ AddEventHandler('qb-drugprocessing:ChangeTemp2', function() end, function() -- failure print("failure") - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') - TriggerServerEvent('qb-drugtrafficking:processFailDown') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:processFailDown') end) else QBCore.Functions.Notify('Temperature is Already Hot Enough', 'error') end end) -RegisterNetEvent('qb-drugprocessing:ProcessProduct') -AddEventHandler('qb-drugprocessing:ProcessProduct', function() +RegisterNetEvent('ps-drugprocessing:ProcessProduct') +AddEventHandler('ps-drugprocessing:ProcessProduct', function() local coords = GetEntityCoords(PlayerPedId(source)) if GetDistanceBetweenCoords(coords, Config.CircleZones.MethBag.coords, true) < 5 then @@ -167,7 +167,7 @@ function ProcessChemicals() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processChemicals') + TriggerServerEvent('ps-drugtrafficking:processChemicals') local timeLeft = Config.Delays.MethProcessing / 1000 @@ -177,7 +177,7 @@ function ProcessChemicals() if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.MethProcessing.coords, false) > 2 then QBCore.Functions.Notify('The processing has been canceled due to you abandoning the area') - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -201,7 +201,7 @@ function ProcessTempUp() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processTempUp') + TriggerServerEvent('ps-drugtrafficking:processTempUp') local timeLeft = Config.Delays.MethProcessing / 1000 @@ -211,7 +211,7 @@ function ProcessTempUp() if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.MethTemp.coords, false) > 2 then QBCore.Functions.Notify('The processing has been canceled due to you abandoning the area') - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -235,7 +235,7 @@ function ProcessTempDown() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processTempDown') + TriggerServerEvent('ps-drugtrafficking:processTempDown') local timeLeft = Config.Delays.MethProcessing / 1000 @@ -245,7 +245,7 @@ function ProcessTempDown() if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.MethTemp.coords, false) > 2 then QBCore.Functions.Notify('The processing has been canceled due to you abandoning the area') - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -270,7 +270,7 @@ function ProcessProduct() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processMeth') + TriggerServerEvent('ps-drugtrafficking:processMeth') local timeLeft = Config.Delays.MethProcessing / 1000 @@ -280,7 +280,7 @@ function ProcessProduct() if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.MethBag.coords, false) > 2 then QBCore.Functions.Notify('The processing has been canceled due to you abandoning the area') - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -293,8 +293,8 @@ function ProcessProduct() end -RegisterNetEvent('qb-drugprocessing:EnterLab') -AddEventHandler('qb-drugprocessing:EnterLab', function() +RegisterNetEvent('ps-drugprocessing:EnterLab') +AddEventHandler('ps-drugprocessing:EnterLab', function() local ped = PlayerPedId() local pos = GetEntityCoords(ped) local dist = #(pos - vector3(Config.MethLab["enter"].coords.x, Config.MethLab["enter"].coords.y, Config.MethLab["enter"].coords.z)) @@ -313,8 +313,8 @@ AddEventHandler('qb-drugprocessing:EnterLab', function() end end) -RegisterNetEvent('qb-drugprocessing:ExitLab') -AddEventHandler('qb-drugprocessing:ExitLab', function() +RegisterNetEvent('ps-drugprocessing:ExitLab') +AddEventHandler('ps-drugprocessing:ExitLab', function() local ped = PlayerPedId() local pos = GetEntityCoords(ped) local dist = #(pos - vector3(Config.MethLab["exit"].coords.x, Config.MethLab["exit"].coords.y, Config.MethLab["exit"].coords.z)) diff --git a/client/sodiumhydroxide.lua b/client/sodiumhydroxide.lua index a85fe4c..9017acf 100644 --- a/client/sodiumhydroxide.lua +++ b/client/sodiumhydroxide.lua @@ -1,6 +1,6 @@ local spawnedSodiumHydroxideBarrels = 0 local SodiumHydroxideBarrels = {} -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() Citizen.CreateThread(function() while true do @@ -16,8 +16,8 @@ Citizen.CreateThread(function() end end) -RegisterNetEvent("qb-drugtrafficking:client:sodium") -AddEventHandler("qb-drugtrafficking:client:sodium", function() +RegisterNetEvent("ps-drugtrafficking:client:sodium") +AddEventHandler("ps-drugtrafficking:client:sodium", function() Citizen.Wait(0) local playerPe3 = PlayerPedId() local coords = GetEntityCoords(playerPe3) @@ -48,7 +48,7 @@ AddEventHandler("qb-drugtrafficking:client:sodium", function() table.remove(SodiumHydroxideBarrels, nearbyID3) spawnedSodiumHydroxideBarrels = spawnedSodiumHydroxideBarrels - 1 - TriggerServerEvent('qb-drugtrafficking:pickedUpSodiumHydroxide') + TriggerServerEvent('ps-drugtrafficking:pickedUpSodiumHydroxide') end, function() ClearPedTasks(PlayerPedId()) diff --git a/client/sulfuricacid.lua b/client/sulfuricacid.lua index 6b93e5f..6335f57 100644 --- a/client/sulfuricacid.lua +++ b/client/sulfuricacid.lua @@ -1,6 +1,6 @@ local spawnedSulfuricAcidBarrels = 0 local SulfuricAcidBarrels = {} -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() Citizen.CreateThread(function() while true do @@ -16,8 +16,8 @@ Citizen.CreateThread(function() end end) -RegisterNetEvent("qb-drugtrafficking:client:sulfuric") -AddEventHandler("qb-drugtrafficking:client:sulfuric", function() +RegisterNetEvent("ps-drugtrafficking:client:sulfuric") +AddEventHandler("ps-drugtrafficking:client:sulfuric", function() Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) @@ -48,7 +48,7 @@ AddEventHandler("qb-drugtrafficking:client:sulfuric", function() table.remove(SulfuricAcidBarrels, nearbyID) spawnedSulfuricAcidBarrels = spawnedSulfuricAcidBarrels - 1 - TriggerServerEvent('qb-drugtrafficking:pickedUpSulfuricAcid') + TriggerServerEvent('ps-drugtrafficking:pickedUpSulfuricAcid') end, function() ClearPedTasks(PlayerPedId()) diff --git a/client/target.lua b/client/target.lua index ece7b02..f0a62b0 100644 --- a/client/target.lua +++ b/client/target.lua @@ -1,7 +1,7 @@ -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() Citizen.CreateThread(function() - exports['qb-target']:SpawnPed({ + exports['ps-target']:SpawnPed({ model = 'a_m_m_hillbilly_02', coords = vector4(-1187.73, -445.27, 43.91, 289.45), minusOne = true, @@ -12,7 +12,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:EnterLab", + event = "ps-drugprocessing:EnterLab", icon = "fas fa-atom", label = "Talk to Walter", } @@ -20,7 +20,7 @@ Citizen.CreateThread(function() distance = 2.5, }, }) - exports['qb-target']:SpawnPed({ + exports['ps-target']:SpawnPed({ model = 'a_m_m_mlcrisis_01', coords = vector4(811.03, -2400.17, 23.66, 216.01), minusOne = true, @@ -31,7 +31,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:EnterCWarehouse", + event = "ps-drugprocessing:EnterCWarehouse", icon = "fas fa-key", label = "Talk to Draco", } @@ -42,7 +42,7 @@ Citizen.CreateThread(function() end) Citizen.CreateThread(function() - exports["qb-target"]:AddBoxZone("chemmenu", vector3(3535.66, 3661.69, 28.12), 1.65, 2.4, { + exports["ps-target"]:AddBoxZone("chemmenu", vector3(3535.66, 3661.69, 28.12), 1.65, 2.4, { name = "chemmenu", heading = 350.0, debugPoly = false, @@ -52,7 +52,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugtrafficking:chemicalmenu", + event = "ps-drugtrafficking:chemicalmenu", icon = "fas fa-vials", label = "Learn a New Chemical Compound", --job = "pawnshop", -- Remove this line if you do not want a job check. @@ -60,7 +60,7 @@ Citizen.CreateThread(function() }, distance = 2.5 }) - exports["qb-target"]:AddBoxZone("methprocess", vector3(978.22, -147.1, -48.53), 1.6, 1.8, { + exports["ps-target"]:AddBoxZone("methprocess", vector3(978.22, -147.1, -48.53), 1.6, 1.8, { name = "methprocess", heading = 0, debugPoly = false, @@ -70,7 +70,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ProcessChemicals", + event = "ps-drugprocessing:ProcessChemicals", icon = "fas fa-vials", label = "Cook Something Wonderful & Blue", --job = "methcook", -- Remove this line if you do not want a job check. @@ -78,7 +78,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("methtempup", vector3(982.56, -145.59, -49.0), 1.2, 1.4, { + exports["ps-target"]:AddBoxZone("methtempup", vector3(982.56, -145.59, -49.0), 1.2, 1.4, { name = "methtempup", heading = 0, debugPoly = false, @@ -88,7 +88,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ChangeTemp", + event = "ps-drugprocessing:ChangeTemp", icon = "fas fa-temperature-empty", label = "Hmmm Seems Cold", --job = "methcook", -- Remove this line if you do not want a job check. @@ -96,7 +96,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("methtempdown", vector3(979.59, -144.14, -49.0), 1.2, 0.5, { + exports["ps-target"]:AddBoxZone("methtempdown", vector3(979.59, -144.14, -49.0), 1.2, 0.5, { name = "methtempdown", heading = 354, debugPoly = false, @@ -106,7 +106,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ChangeTemp2", + event = "ps-drugprocessing:ChangeTemp2", icon = "fas fa-temperature-full", label = "Hmmm Seems Hot", --job = "methcook", -- Remove this line if you do not want a job check. @@ -114,7 +114,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("methbagging", vector3(987.44, -140.5, -49.0), 0.5, 0.7, { + exports["ps-target"]:AddBoxZone("methbagging", vector3(987.44, -140.5, -49.0), 0.5, 0.7, { name = "methbagging", heading = 1, debugPoly = false, @@ -124,7 +124,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ProcessProduct", + event = "ps-drugprocessing:ProcessProduct", icon = "fas fa-box", label = "Start Bagging", --job = "methcook", -- Remove this line if you do not want a job check. @@ -132,7 +132,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("methkeypad", vector3(969.04, -146.17, -46.4), 0.4, 0.2, { + exports["ps-target"]:AddBoxZone("methkeypad", vector3(969.04, -146.17, -46.4), 0.4, 0.2, { name = "methkeypad", heading = 0, debugPoly = false, @@ -142,7 +142,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ExitLab", + event = "ps-drugprocessing:ExitLab", icon = "fas fa-lock", label = "Secure Lab & Leave", --job = "methcook", -- Remove this line if you do not want a job check. @@ -150,7 +150,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("cokekeypad", vector3(1087.66, -3187.16, -38.99), 0.1, 0.2, { + exports["ps-target"]:AddBoxZone("cokekeypad", vector3(1087.66, -3187.16, -38.99), 0.1, 0.2, { name = "cokekeypad", heading = 0, debugPoly = false, @@ -160,7 +160,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ExitCWarehouse", + event = "ps-drugprocessing:ExitCWarehouse", icon = "fas fa-lock", label = "Secure Warehouse & Leave", --job = "cokecutter", -- Remove this line if you do not want a job check. @@ -168,7 +168,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("cokeleafproc", vector3(1086.2, -3194.9, -38.99), 2.5, 1.4, { + exports["ps-target"]:AddBoxZone("cokeleafproc", vector3(1086.2, -3194.9, -38.99), 2.5, 1.4, { name = "cokeleafproc", heading = 0, debugPoly = false, @@ -178,7 +178,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ProcessCocaFarm", + event = "ps-drugprocessing:ProcessCocaFarm", icon = "fas fa-scissors", label = "Breakdown Leaves", --job = "cokecutter", -- Remove this line if you do not want a job check. @@ -186,7 +186,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("cokepowdercut", vector3(1092.89, -3195.78, -38.99), 7.65, 1.2, { + exports["ps-target"]:AddBoxZone("cokepowdercut", vector3(1092.89, -3195.78, -38.99), 7.65, 1.2, { name = "cokepowdercut", heading = 90, debugPoly = false, @@ -196,7 +196,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ProcessCocaPowder", + event = "ps-drugprocessing:ProcessCocaPowder", icon = "fas fa-weight-scale", label = "Cut Product & Weight", --job = "cokecutter", -- Remove this line if you do not want a job check. @@ -204,7 +204,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["qb-target"]:AddBoxZone("cokebricked", vector3(1098.77, -3194.19, -38.99), 2.6, 1.0, { + exports["ps-target"]:AddBoxZone("cokebricked", vector3(1098.77, -3194.19, -38.99), 2.6, 1.0, { name = "cokebricked", heading = 90, debugPoly = false, @@ -214,7 +214,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "qb-drugprocessing:ProcessBricks", + event = "ps-drugprocessing:ProcessBricks", icon = "fas fa-weight-scale", label = "Brick Up Product", --job = "cokecutter", -- Remove this line if you do not want a job check. @@ -225,66 +225,66 @@ Citizen.CreateThread(function() end) Citizen.CreateThread(function() - exports['qb-target']:AddTargetModel("mw_coke_plant", { + exports['ps-target']:AddTargetModel("mw_coke_plant", { options = { { type = "client", - event = "qb-drugtrafficking:client:coke", + event = "ps-drugtrafficking:client:coke", icon = "fas fa-leaf", label = "Pickup Coke Leafs", }, }, distance = 4.0 }) - exports['qb-target']:AddTargetModel("mw_heroin_plant", { + exports['ps-target']:AddTargetModel("mw_heroin_plant", { options = { { type = "client", - event = "qb-drugtrafficking:client:heorin", + event = "ps-drugtrafficking:client:heorin", icon = "fas fa-seedling", label = "Pickup Poppy Plants", }, }, distance = 4.0 }) - exports['qb-target']:AddTargetModel("mw_weed_plant", { + exports['ps-target']:AddTargetModel("mw_weed_plant", { options = { { type = "client", - event = "qb-drugtrafficking:client:weed", + event = "ps-drugtrafficking:client:weed", icon = "fas fa-envira", label = "Pickup Weed Leafs", }, }, distance = 4.0 }) - exports['qb-target']:AddTargetModel("mw_sodium_barrel", { + exports['ps-target']:AddTargetModel("mw_sodium_barrel", { options = { { type = "client", - event = "qb-drugtrafficking:client:sodium", + event = "ps-drugtrafficking:client:sodium", icon = "fas fa-dna", label = "Pickup Sodium Barrel", }, }, distance = 4.0 }) - exports['qb-target']:AddTargetModel("mw_sulfuric_barrel", { + exports['ps-target']:AddTargetModel("mw_sulfuric_barrel", { options = { { type = "client", - event = "qb-drugtrafficking:client:sulfuric", + event = "ps-drugtrafficking:client:sulfuric", icon = "fas fa-shield-virus", label = "Pickup Sulfuric Barrel", }, }, distance = 4.0 }) - exports['qb-target']:AddTargetModel("mw_chemical_barrel", { + exports['ps-target']:AddTargetModel("mw_chemical_barrel", { options = { { type = "client", - event = "qb-drugtrafficking:chemicals", + event = "ps-drugtrafficking:chemicals", icon = "fas fa-radiation", label = "Pickup Chem Barrels", }, diff --git a/client/weed.lua b/client/weed.lua index e050c59..ee2d6c1 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -1,7 +1,7 @@ local spawnedWeeds = 0 local weedPlants = {} local isPickingUp, isProcessing = false, false -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() @@ -59,7 +59,7 @@ function ProcessWeed() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processCannabis') + TriggerServerEvent('ps-drugtrafficking:processCannabis') local timeLeft = Config.Delays.WeedProcessing / 1000 @@ -68,7 +68,7 @@ function ProcessWeed() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.WeedProcessing.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -79,8 +79,8 @@ function ProcessWeed() isProcessing = false end -RegisterNetEvent("qb-drugtrafficking:client:weed") -AddEventHandler("qb-drugtrafficking:client:weed", function() +RegisterNetEvent("ps-drugtrafficking:client:weed") +AddEventHandler("ps-drugtrafficking:client:weed", function() Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) @@ -111,7 +111,7 @@ AddEventHandler("qb-drugtrafficking:client:weed", function() table.remove(weedPlants, nearbyID) spawnedWeeds = spawnedWeeds - 1 - TriggerServerEvent('qb-drugtrafficking:pickedUpCannabis') + TriggerServerEvent('ps-drugtrafficking:pickedUpCannabis') end, function() ClearPedTasks(PlayerPedId()) @@ -209,8 +209,8 @@ function GetCoordZWeed(x, y) return 53.85 end -RegisterNetEvent('qb-drugtrafficking:client:rollJoint') -AddEventHandler('qb-drugtrafficking:client:rollJoint', function() +RegisterNetEvent('ps-drugtrafficking:client:rollJoint') +AddEventHandler('ps-drugtrafficking:client:rollJoint', function() QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) if result then RollJoint() @@ -232,7 +232,7 @@ function RollJoint() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:rollJoint') + TriggerServerEvent('ps-drugtrafficking:rollJoint') local timeLeft = Config.Delays.WeedProcessing / 1000 while timeLeft > 0 do diff --git a/server/chemicals.lua b/server/chemicals.lua index 6604204..6be2cb7 100644 --- a/server/chemicals.lua +++ b/server/chemicals.lua @@ -1,9 +1,9 @@ -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() local playersProcessingChemicalsToHydrochloricAcid = {} -RegisterServerEvent('qb-drugtrafficking:pickedUpChemicals') -AddEventHandler('qb-drugtrafficking:pickedUpChemicals', function() +RegisterServerEvent('ps-drugtrafficking:pickedUpChemicals') +AddEventHandler('ps-drugtrafficking:pickedUpChemicals', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -11,8 +11,8 @@ AddEventHandler('qb-drugtrafficking:pickedUpChemicals', function() TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["chemicals"], "add") end) -RegisterServerEvent('qb-drugtrafficking:processHydrochloric_acid') -AddEventHandler('qb-drugtrafficking:processHydrochloric_acid', function() +RegisterServerEvent('ps-drugtrafficking:processHydrochloric_acid') +AddEventHandler('ps-drugtrafficking:processHydrochloric_acid', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -23,8 +23,8 @@ AddEventHandler('qb-drugtrafficking:processHydrochloric_acid', function() TriggerClientEvent('QBCore:Notify', src, 'Hydrochloric acid process was succesful !', "success") end) -RegisterServerEvent('qb-drugtrafficking:processsodium_hydroxide') -AddEventHandler('qb-drugtrafficking:processsodium_hydroxide', function() +RegisterServerEvent('ps-drugtrafficking:processsodium_hydroxide') +AddEventHandler('ps-drugtrafficking:processsodium_hydroxide', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -35,8 +35,8 @@ AddEventHandler('qb-drugtrafficking:processsodium_hydroxide', function() TriggerClientEvent('QBCore:Notify', src, 'Sodium Hydroxide process was succesful !', "success") end) -RegisterServerEvent('qb-drugtrafficking:processprocess_sulfuric_acid') -AddEventHandler('qb-drugtrafficking:processprocess_sulfuric_acid', function() +RegisterServerEvent('ps-drugtrafficking:processprocess_sulfuric_acid') +AddEventHandler('ps-drugtrafficking:processprocess_sulfuric_acid', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -47,8 +47,8 @@ AddEventHandler('qb-drugtrafficking:processprocess_sulfuric_acid', function() TriggerClientEvent('QBCore:Notify', src, 'Sulfuric Acid process was succesful !', "success") end) -RegisterServerEvent('qb-drugtrafficking:process_lsa') -AddEventHandler('qb-drugtrafficking:process_lsa', function() +RegisterServerEvent('ps-drugtrafficking:process_lsa') +AddEventHandler('ps-drugtrafficking:process_lsa', function() local src = source local Player = QBCore.Functions.GetPlayer(src) diff --git a/server/coke.lua b/server/coke.lua index 44c2c59..4376223 100644 --- a/server/coke.lua +++ b/server/coke.lua @@ -1,8 +1,8 @@ local playersProcessingCocaLeaf = {} -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() -RegisterServerEvent('qb-drugtrafficking:pickedUpCocaLeaf') -AddEventHandler('qb-drugtrafficking:pickedUpCocaLeaf', function() +RegisterServerEvent('ps-drugtrafficking:pickedUpCocaLeaf') +AddEventHandler('ps-drugtrafficking:pickedUpCocaLeaf', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -10,8 +10,8 @@ AddEventHandler('qb-drugtrafficking:pickedUpCocaLeaf', function() TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["coca_leaf"], "add") end) -RegisterServerEvent('qb-drugtrafficking:processCocaLeaf') -AddEventHandler('qb-drugtrafficking:processCocaLeaf', function() +RegisterServerEvent('ps-drugtrafficking:processCocaLeaf') +AddEventHandler('ps-drugtrafficking:processCocaLeaf', function() local src = source local Player = QBCore.Functions.GetPlayer(src) local count = math.random(2,7) @@ -23,8 +23,8 @@ AddEventHandler('qb-drugtrafficking:processCocaLeaf', function() TriggerClientEvent('QBCore:Notify', src, 'Cocaine Leafs successfully processed!', "success") end) -RegisterServerEvent('qb-drugtrafficking:processCocaPowder') -AddEventHandler('qb-drugtrafficking:processCocaPowder', function() +RegisterServerEvent('ps-drugtrafficking:processCocaPowder') +AddEventHandler('ps-drugtrafficking:processCocaPowder', function() local src = source local Player = QBCore.Functions.GetPlayer(src) local count = math.random(1,2) @@ -38,8 +38,8 @@ AddEventHandler('qb-drugtrafficking:processCocaPowder', function() TriggerClientEvent('QBCore:Notify', src, 'Cocaine Powder successfully Cut!', "success") end) -RegisterServerEvent('qb-drugtrafficking:processCocaBrick') -AddEventHandler('qb-drugtrafficking:processCocaBrick', function() +RegisterServerEvent('ps-drugtrafficking:processCocaBrick') +AddEventHandler('ps-drugtrafficking:processCocaBrick', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -57,8 +57,8 @@ function CancelProcessing(playerId) end end -RegisterServerEvent('qb-drugtrafficking:cancelProcessing') -AddEventHandler('qb-drugtrafficking:cancelProcessing', function() +RegisterServerEvent('ps-drugtrafficking:cancelProcessing') +AddEventHandler('ps-drugtrafficking:cancelProcessing', function() CancelProcessing(source) end) diff --git a/server/heroin.lua b/server/heroin.lua index 865355e..affdea5 100644 --- a/server/heroin.lua +++ b/server/heroin.lua @@ -1,8 +1,8 @@ local playersProcessingPoppyResin = {} -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() -RegisterServerEvent('qb-drugtrafficking:pickedUpPoppy') -AddEventHandler('qb-drugtrafficking:pickedUpPoppy', function() +RegisterServerEvent('ps-drugtrafficking:pickedUpPoppy') +AddEventHandler('ps-drugtrafficking:pickedUpPoppy', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -10,8 +10,8 @@ AddEventHandler('qb-drugtrafficking:pickedUpPoppy', function() TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["poppyresin"], "add") end) -RegisterServerEvent('qb-drugtrafficking:processPoppyResin') -AddEventHandler('qb-drugtrafficking:processPoppyResin', function() +RegisterServerEvent('ps-drugtrafficking:processPoppyResin') +AddEventHandler('ps-drugtrafficking:processPoppyResin', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -29,7 +29,7 @@ function CancelProcessing(playerID) end end -RegisterServerEvent('qb-drugtrafficking:cancelProcessing') -AddEventHandler('qb-drugtrafficking:cancelProcessing', function() +RegisterServerEvent('ps-drugtrafficking:cancelProcessing') +AddEventHandler('ps-drugtrafficking:cancelProcessing', function() CancelProcessing(source) end) \ No newline at end of file diff --git a/server/lsd.lua b/server/lsd.lua index ca9328d..cae7d27 100644 --- a/server/lsd.lua +++ b/server/lsd.lua @@ -1,8 +1,8 @@ local playersProcessingLSD = {} -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() -RegisterServerEvent('qb-drugtrafficking:Processlsd') -AddEventHandler('qb-drugtrafficking:Processlsd', function() +RegisterServerEvent('ps-drugtrafficking:Processlsd') +AddEventHandler('ps-drugtrafficking:Processlsd', function() if not playersProcessingLSD[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -14,8 +14,8 @@ AddEventHandler('qb-drugtrafficking:Processlsd', function() end end) -RegisterServerEvent('qb-drugtrafficking:processThionylChloride') -AddEventHandler('qb-drugtrafficking:processThionylChloride', function() +RegisterServerEvent('ps-drugtrafficking:processThionylChloride') +AddEventHandler('ps-drugtrafficking:processThionylChloride', function() if not playersProcessingLSD[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -33,7 +33,7 @@ function CancelProcessing(playerID) end end -RegisterServerEvent('qb-drugtrafficking:cancelProcessing') -AddEventHandler('qb-drugtrafficking:cancelProcessing', function() +RegisterServerEvent('ps-drugtrafficking:cancelProcessing') +AddEventHandler('ps-drugtrafficking:cancelProcessing', function() CancelProcessing(source) end) \ No newline at end of file diff --git a/server/meth.lua b/server/meth.lua index b2f6df2..8d5c615 100644 --- a/server/meth.lua +++ b/server/meth.lua @@ -1,8 +1,8 @@ local playersProcessingMeth = {} -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() -RegisterServerEvent('qb-drugtrafficking:pickedUpHydrochloricAcid') -AddEventHandler('qb-drugtrafficking:pickedUpHydrochloricAcid', function() +RegisterServerEvent('ps-drugtrafficking:pickedUpHydrochloricAcid') +AddEventHandler('ps-drugtrafficking:pickedUpHydrochloricAcid', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -10,8 +10,8 @@ AddEventHandler('qb-drugtrafficking:pickedUpHydrochloricAcid', function() TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["hydrochloric_acid"], "add") end) -RegisterServerEvent('qb-drugtrafficking:pickedUpSodiumHydroxide') -AddEventHandler('qb-drugtrafficking:pickedUpSodiumHydroxide', function() +RegisterServerEvent('ps-drugtrafficking:pickedUpSodiumHydroxide') +AddEventHandler('ps-drugtrafficking:pickedUpSodiumHydroxide', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -19,8 +19,8 @@ AddEventHandler('qb-drugtrafficking:pickedUpSodiumHydroxide', function() TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["sodium_hydroxide"], "add") end) -RegisterServerEvent('qb-drugtrafficking:pickedUpSulfuricAcid') -AddEventHandler('qb-drugtrafficking:pickedUpSulfuricAcid', function() +RegisterServerEvent('ps-drugtrafficking:pickedUpSulfuricAcid') +AddEventHandler('ps-drugtrafficking:pickedUpSulfuricAcid', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -28,8 +28,8 @@ AddEventHandler('qb-drugtrafficking:pickedUpSulfuricAcid', function() TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["sulfuric_acid"], "add") end) -RegisterServerEvent('qb-drugtrafficking:processChemicals') -AddEventHandler('qb-drugtrafficking:processChemicals', function() +RegisterServerEvent('ps-drugtrafficking:processChemicals') +AddEventHandler('ps-drugtrafficking:processChemicals', function() if not playersProcessingMeth[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -45,8 +45,8 @@ AddEventHandler('qb-drugtrafficking:processChemicals', function() end end) -RegisterServerEvent('qb-drugtrafficking:processTempUp') -AddEventHandler('qb-drugtrafficking:processTempUp', function() +RegisterServerEvent('ps-drugtrafficking:processTempUp') +AddEventHandler('ps-drugtrafficking:processTempUp', function() if not playersProcessingMeth[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -58,8 +58,8 @@ AddEventHandler('qb-drugtrafficking:processTempUp', function() end end) -RegisterServerEvent('qb-drugtrafficking:processTempDown') -AddEventHandler('qb-drugtrafficking:processTempDown', function() +RegisterServerEvent('ps-drugtrafficking:processTempDown') +AddEventHandler('ps-drugtrafficking:processTempDown', function() if not playersProcessingMeth[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -71,8 +71,8 @@ AddEventHandler('qb-drugtrafficking:processTempDown', function() end end) -RegisterServerEvent('qb-drugtrafficking:processMeth') -AddEventHandler('qb-drugtrafficking:processMeth', function() +RegisterServerEvent('ps-drugtrafficking:processMeth') +AddEventHandler('ps-drugtrafficking:processMeth', function() if not playersProcessingMeth[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -85,8 +85,8 @@ AddEventHandler('qb-drugtrafficking:processMeth', function() end end) -RegisterServerEvent('qb-drugtrafficking:processFailUp') -AddEventHandler('qb-drugtrafficking:processFailUp', function() +RegisterServerEvent('ps-drugtrafficking:processFailUp') +AddEventHandler('ps-drugtrafficking:processFailUp', function() if not playersProcessingMeth[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -96,8 +96,8 @@ AddEventHandler('qb-drugtrafficking:processFailUp', function() end end) -RegisterServerEvent('qb-drugtrafficking:processFailDown') -AddEventHandler('qb-drugtrafficking:processFailDown', function() +RegisterServerEvent('ps-drugtrafficking:processFailDown') +AddEventHandler('ps-drugtrafficking:processFailDown', function() if not playersProcessingMeth[source] then local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -113,8 +113,8 @@ function CancelProcessing(playerID) end end -RegisterServerEvent('qb-drugtrafficking:cancelProcessing') -AddEventHandler('qb-drugtrafficking:cancelProcessing', function() +RegisterServerEvent('ps-drugtrafficking:cancelProcessing') +AddEventHandler('ps-drugtrafficking:cancelProcessing', function() CancelProcessing(source) end) diff --git a/server/weed.lua b/server/weed.lua index ea46a7d..3e42621 100644 --- a/server/weed.lua +++ b/server/weed.lua @@ -1,9 +1,9 @@ -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() local playersProcessingCannabis = {} -RegisterServerEvent('qb-drugtrafficking:pickedUpCannabis') -AddEventHandler('qb-drugtrafficking:pickedUpCannabis', function() +RegisterServerEvent('ps-drugtrafficking:pickedUpCannabis') +AddEventHandler('ps-drugtrafficking:pickedUpCannabis', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -11,8 +11,8 @@ AddEventHandler('qb-drugtrafficking:pickedUpCannabis', function() TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["cannabis"], "add") end) -RegisterServerEvent('qb-drugtrafficking:processCannabis') -AddEventHandler('qb-drugtrafficking:processCannabis', function() +RegisterServerEvent('ps-drugtrafficking:processCannabis') +AddEventHandler('ps-drugtrafficking:processCannabis', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -23,8 +23,8 @@ AddEventHandler('qb-drugtrafficking:processCannabis', function() TriggerClientEvent('QBCore:Notify', src, 'Cannabis successfully processed!', "success") end) -RegisterServerEvent('qb-drugtrafficking:rollJoint') -AddEventHandler('qb-drugtrafficking:rollJoint', function() +RegisterServerEvent('ps-drugtrafficking:rollJoint') +AddEventHandler('ps-drugtrafficking:rollJoint', function() local src = source local Player = QBCore.Functions.GetPlayer(src) @@ -44,12 +44,12 @@ function CancelProcessing(playerId) end end -RegisterServerEvent('qb-drugtrafficking:cancelProcessing') -AddEventHandler('qb-drugtrafficking:cancelProcessing', function() +RegisterServerEvent('ps-drugtrafficking:cancelProcessing') +AddEventHandler('ps-drugtrafficking:cancelProcessing', function() CancelProcessing(source) end) QBCore.Functions.CreateUseableItem("rolling_paper", function(source, item) local Player = QBCore.Functions.GetPlayer(source) - TriggerClientEvent('qb-drugtrafficking:client:rollJoint', source, 'marijuana', item) + TriggerClientEvent('ps-drugtrafficking:client:rollJoint', source, 'marijuana', item) end) \ No newline at end of file From d0d95c8e7c61616188db9d047b469f388deecef8 Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Mon, 25 Apr 2022 04:15:41 -0400 Subject: [PATCH 3/7] Prefix change --- client/coke.lua | 93 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 20 deletions(-) diff --git a/client/coke.lua b/client/coke.lua index a216c75..602cfec 100644 --- a/client/coke.lua +++ b/client/coke.lua @@ -1,4 +1,4 @@ -local QBCore = exports['qb-core']:GetCoreObject() +local QBCore = exports['ps-core']:GetCoreObject() local spawnedCocaLeaf = 0 local CocaPlants = {} @@ -19,8 +19,8 @@ Citizen.CreateThread(function() end end) -RegisterNetEvent('qb-drugprocessing:ProcessCocaFarm') -AddEventHandler('qb-drugprocessing:ProcessCocaFarm', function() +RegisterNetEvent('ps-drugprocessing:ProcessCocaFarm') +AddEventHandler('ps-drugprocessing:ProcessCocaFarm', function() local coords = GetEntityCoords(PlayerPedId(source)) if GetDistanceBetweenCoords(coords, Config.CircleZones.CokeProcessing.coords, true) < 5 then @@ -46,8 +46,8 @@ AddEventHandler('qb-drugprocessing:ProcessCocaFarm', function() end end) -RegisterNetEvent('qb-drugprocessing:ProcessCocaPowder') -AddEventHandler('qb-drugprocessing:ProcessCocaPowder', function() +RegisterNetEvent('ps-drugprocessing:ProcessCocaPowder') +AddEventHandler('ps-drugprocessing:ProcessCocaPowder', function() local coords = GetEntityCoords(PlayerPedId(source)) local amount = 10 local amount2 = 5 @@ -94,8 +94,8 @@ AddEventHandler('qb-drugprocessing:ProcessCocaPowder', function() end end) -RegisterNetEvent('qb-drugprocessing:ProcessBricks') -AddEventHandler('qb-drugprocessing:ProcessBricks', function() +RegisterNetEvent('ps-drugprocessing:ProcessBricks') +AddEventHandler('ps-drugprocessing:ProcessBricks', function() local coords = GetEntityCoords(PlayerPedId(source)) local amount = 4 @@ -127,8 +127,8 @@ AddEventHandler('qb-drugprocessing:ProcessBricks', function() end end) -RegisterNetEvent('qb-drugprocessing:EnterCWarehouse') -AddEventHandler('qb-drugprocessing:EnterCWarehouse', function() +RegisterNetEvent('ps-drugprocessing:EnterCWarehouse') +AddEventHandler('ps-drugprocessing:EnterCWarehouse', function() local ped = PlayerPedId() local pos = GetEntityCoords(ped) local dist = #(pos - vector3(Config.CokeLab["enter"].coords.x, Config.CokeLab["enter"].coords.y, Config.CokeLab["enter"].coords.z)) @@ -146,8 +146,8 @@ AddEventHandler('qb-drugprocessing:EnterCWarehouse', function() end end) -RegisterNetEvent('qb-drugprocessing:ExitCWarehouse') -AddEventHandler('qb-drugprocessing:ExitCWarehouse', function() +RegisterNetEvent('ps-drugprocessing:ExitCWarehouse') +AddEventHandler('ps-drugprocessing:ExitCWarehouse', function() local ped = PlayerPedId() local pos = GetEntityCoords(ped) local dist = #(pos - vector3(Config.CokeLab["exit"].coords.x, Config.CokeLab["exit"].coords.y, Config.CokeLab["exit"].coords.z)) @@ -198,7 +198,7 @@ function ProcessCoke() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processCocaLeaf') + TriggerServerEvent('ps-drugtrafficking:processCocaLeaf') local timeLeft = Config.Delays.CokeProcessing / 1000 @@ -207,7 +207,7 @@ function ProcessCoke() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.CokeProcessing.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -230,7 +230,7 @@ function CutCokePowder() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processCocaPowder') + TriggerServerEvent('ps-drugtrafficking:processCocaPowder') local timeLeft = Config.Delays.CokeProcessing / 1000 @@ -239,7 +239,7 @@ function CutCokePowder() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.CokeProcessing.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -263,7 +263,7 @@ function ProcessBricks() disableMouse = false, disableCombat = true, }, {}, {}, {}, function() - TriggerServerEvent('qb-drugtrafficking:processCocaBrick') + TriggerServerEvent('ps-drugtrafficking:processCocaBrick') local timeLeft = Config.Delays.CokeProcessing / 1000 @@ -272,7 +272,7 @@ function ProcessBricks() timeLeft = timeLeft - 1 if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.CokeBrick.coords, false) > 4 then - TriggerServerEvent('qb-drugtrafficking:cancelProcessing') + TriggerServerEvent('ps-drugtrafficking:cancelProcessing') break end end @@ -285,8 +285,8 @@ function ProcessBricks() end -RegisterNetEvent('qb-drugprocessing:pickCocaLeaves') -AddEventHandler('qb-drugprocessing:pickCocaLeaves', function() +RegisterNetEvent('ps-drugprocessing:pickCocaLeaves') +AddEventHandler('ps-drugprocessing:pickCocaLeaves', function() local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) local nearbyObject, nearbyID @@ -316,7 +316,7 @@ AddEventHandler('qb-drugprocessing:pickCocaLeaves', function() table.remove(CocaPlants, nearbyID) spawnedCocaLeaf = spawnedCocaLeaf - 1 - TriggerServerEvent('qb-drugtrafficking:pickedUpCocaLeaf') + TriggerServerEvent('ps-drugtrafficking:pickedUpCocaLeaf') end, function() ClearPedTasks(PlayerPedId()) @@ -330,6 +330,59 @@ AddEventHandler('qb-drugprocessing:pickCocaLeaves', function() end) +<<<<<<< Updated upstream +======= +--[[Citizen.CreateThread(function() + while true do + Citizen.Wait(0) + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) + local nearbyObject, nearbyID + + for i=1, #CocaPlants, 1 do + if GetDistanceBetweenCoords(coords, GetEntityCoords(CocaPlants[i]), false) < 1 then + nearbyObject, nearbyID = CocaPlants[i], i + end + end + + if nearbyObject and IsPedOnFoot(playerPed) then + + if not isPickingUp then + QBCore.Functions.Draw2DText(0.5, 0.88, 'Press [~g~ E ~w~] to pick cocaine leaves', 0.5) + end + + if IsControlJustReleased(0, 38) and not isPickingUp then + isPickingUp = true + TaskStartScenarioInPlace(playerPed, 'world_human_gardener_plant', 0, false) + + QBCore.Functions.Progressbar("search_register", "Picking cocaine leaves..", 10000, false, true, { + disableMovement = true, + disableCarMovement = true, + disableMouse = false, + disableCombat = true, + }, {}, {}, {}, function() -- Done + ClearPedTasks(PlayerPedId()) + SetEntityAsMissionEntity(nearbyObject, false, true) + DeleteObject(nearbyObject) + + table.remove(CocaPlants, nearbyID) + spawnedCocaLeaf = spawnedCocaLeaf - 1 + + TriggerServerEvent('ps-drugtrafficking:pickedUpCocaLeaf') + + end, function() + ClearPedTasks(PlayerPedId()) + end) + + isPickingUp = false + end + else + Citizen.Wait(500) + end + end +end)]]-- + +>>>>>>> Stashed changes AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then for k, v in pairs(CocaPlants) do From 59252c06364cd9b911ac1943c7c903ff7af34fd3 Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Mon, 25 Apr 2022 04:19:36 -0400 Subject: [PATCH 4/7] Prefix fixed --- client/chemicals.lua | 6 +++--- client/lsd.lua | 2 +- client/target.lua | 36 ++++++++++++++++++------------------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/client/chemicals.lua b/client/chemicals.lua index 40a4c8f..886b810 100644 --- a/client/chemicals.lua +++ b/client/chemicals.lua @@ -50,7 +50,7 @@ end)]]-- RegisterNetEvent('ps-drugtrafficking:chemicalmenu', function() createChemicalMenu() - exports['ps-menu']:openMenu(chemMenu) + exports['qb-menu']:openMenu(chemMenu) end) function createChemicalMenu() @@ -96,11 +96,11 @@ function createChemicalMenu() txt = "Close Menu", params = { isServer = false, - event = exports['ps-menu']:closeMenu(), + event = exports['qb-menu']:closeMenu(), } }, } - exports['ps-menu']:openMenu(chemMenu) + exports['qb-menu']:openMenu(chemMenu) end -------------------------------------------------------------------- diff --git a/client/lsd.lua b/client/lsd.lua index 8b285e6..4bd51db 100644 --- a/client/lsd.lua +++ b/client/lsd.lua @@ -76,7 +76,7 @@ end Citizen.CreateThread(function() - exports['ps-target']:AddBoxZone("thychloride", vector3(-679.77, 5800.7, 17.33), 1, 1, { + exports['qb-target']:AddBoxZone("thychloride", vector3(-679.77, 5800.7, 17.33), 1, 1, { name="thychloride", heading=340.0, debugPoly=false, diff --git a/client/target.lua b/client/target.lua index f0a62b0..566a1fd 100644 --- a/client/target.lua +++ b/client/target.lua @@ -1,7 +1,7 @@ local QBCore = exports['ps-core']:GetCoreObject() Citizen.CreateThread(function() - exports['ps-target']:SpawnPed({ + exports['qb-target']:SpawnPed({ model = 'a_m_m_hillbilly_02', coords = vector4(-1187.73, -445.27, 43.91, 289.45), minusOne = true, @@ -20,7 +20,7 @@ Citizen.CreateThread(function() distance = 2.5, }, }) - exports['ps-target']:SpawnPed({ + exports['qb-target']:SpawnPed({ model = 'a_m_m_mlcrisis_01', coords = vector4(811.03, -2400.17, 23.66, 216.01), minusOne = true, @@ -42,7 +42,7 @@ Citizen.CreateThread(function() end) Citizen.CreateThread(function() - exports["ps-target"]:AddBoxZone("chemmenu", vector3(3535.66, 3661.69, 28.12), 1.65, 2.4, { + exports["qb-target"]:AddBoxZone("chemmenu", vector3(3535.66, 3661.69, 28.12), 1.65, 2.4, { name = "chemmenu", heading = 350.0, debugPoly = false, @@ -60,7 +60,7 @@ Citizen.CreateThread(function() }, distance = 2.5 }) - exports["ps-target"]:AddBoxZone("methprocess", vector3(978.22, -147.1, -48.53), 1.6, 1.8, { + exports["qb-target"]:AddBoxZone("methprocess", vector3(978.22, -147.1, -48.53), 1.6, 1.8, { name = "methprocess", heading = 0, debugPoly = false, @@ -78,7 +78,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("methtempup", vector3(982.56, -145.59, -49.0), 1.2, 1.4, { + exports["qb-target"]:AddBoxZone("methtempup", vector3(982.56, -145.59, -49.0), 1.2, 1.4, { name = "methtempup", heading = 0, debugPoly = false, @@ -96,7 +96,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("methtempdown", vector3(979.59, -144.14, -49.0), 1.2, 0.5, { + exports["qb-target"]:AddBoxZone("methtempdown", vector3(979.59, -144.14, -49.0), 1.2, 0.5, { name = "methtempdown", heading = 354, debugPoly = false, @@ -114,7 +114,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("methbagging", vector3(987.44, -140.5, -49.0), 0.5, 0.7, { + exports["qb-target"]:AddBoxZone("methbagging", vector3(987.44, -140.5, -49.0), 0.5, 0.7, { name = "methbagging", heading = 1, debugPoly = false, @@ -132,7 +132,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("methkeypad", vector3(969.04, -146.17, -46.4), 0.4, 0.2, { + exports["qb-target"]:AddBoxZone("methkeypad", vector3(969.04, -146.17, -46.4), 0.4, 0.2, { name = "methkeypad", heading = 0, debugPoly = false, @@ -150,7 +150,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("cokekeypad", vector3(1087.66, -3187.16, -38.99), 0.1, 0.2, { + exports["qb-target"]:AddBoxZone("cokekeypad", vector3(1087.66, -3187.16, -38.99), 0.1, 0.2, { name = "cokekeypad", heading = 0, debugPoly = false, @@ -168,7 +168,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("cokeleafproc", vector3(1086.2, -3194.9, -38.99), 2.5, 1.4, { + exports["qb-target"]:AddBoxZone("cokeleafproc", vector3(1086.2, -3194.9, -38.99), 2.5, 1.4, { name = "cokeleafproc", heading = 0, debugPoly = false, @@ -186,7 +186,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("cokepowdercut", vector3(1092.89, -3195.78, -38.99), 7.65, 1.2, { + exports["qb-target"]:AddBoxZone("cokepowdercut", vector3(1092.89, -3195.78, -38.99), 7.65, 1.2, { name = "cokepowdercut", heading = 90, debugPoly = false, @@ -204,7 +204,7 @@ Citizen.CreateThread(function() }, distance = 3.5 }) - exports["ps-target"]:AddBoxZone("cokebricked", vector3(1098.77, -3194.19, -38.99), 2.6, 1.0, { + exports["qb-target"]:AddBoxZone("cokebricked", vector3(1098.77, -3194.19, -38.99), 2.6, 1.0, { name = "cokebricked", heading = 90, debugPoly = false, @@ -225,7 +225,7 @@ Citizen.CreateThread(function() end) Citizen.CreateThread(function() - exports['ps-target']:AddTargetModel("mw_coke_plant", { + exports['qb-target']:AddTargetModel("mw_coke_plant", { options = { { type = "client", @@ -236,7 +236,7 @@ Citizen.CreateThread(function() }, distance = 4.0 }) - exports['ps-target']:AddTargetModel("mw_heroin_plant", { + exports['qb-target']:AddTargetModel("mw_heroin_plant", { options = { { type = "client", @@ -247,7 +247,7 @@ Citizen.CreateThread(function() }, distance = 4.0 }) - exports['ps-target']:AddTargetModel("mw_weed_plant", { + exports['qb-target']:AddTargetModel("mw_weed_plant", { options = { { type = "client", @@ -258,7 +258,7 @@ Citizen.CreateThread(function() }, distance = 4.0 }) - exports['ps-target']:AddTargetModel("mw_sodium_barrel", { + exports['qb-target']:AddTargetModel("mw_sodium_barrel", { options = { { type = "client", @@ -269,7 +269,7 @@ Citizen.CreateThread(function() }, distance = 4.0 }) - exports['ps-target']:AddTargetModel("mw_sulfuric_barrel", { + exports['qb-target']:AddTargetModel("mw_sulfuric_barrel", { options = { { type = "client", @@ -280,7 +280,7 @@ Citizen.CreateThread(function() }, distance = 4.0 }) - exports['ps-target']:AddTargetModel("mw_chemical_barrel", { + exports['qb-target']:AddTargetModel("mw_chemical_barrel", { options = { { type = "client", From 90968f9e97977ca02dccd5dc53ecadace230b419 Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Mon, 25 Apr 2022 04:24:40 -0400 Subject: [PATCH 5/7] Added Trigger & Cleanup Removed old code, added trigger for heroin --- client/heroin.lua | 40 +++------------------------------------- client/target.lua | 4 ++-- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/client/heroin.lua b/client/heroin.lua index ede352e..4195a9c 100644 --- a/client/heroin.lua +++ b/client/heroin.lua @@ -17,34 +17,6 @@ Citizen.CreateThread(function() end end end) ---[[ -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - if GetDistanceBetweenCoords(coords, Config.CircleZones.HeroinProcessing.coords, true) < 2 then - if not isProcessing then - local pos = GetEntityCoords(PlayerPedId()) - QBCore.Functions.DrawText3D(pos.x, pos.y, pos.z, "~g~E~w~ - Process poppy resin") - end - - if IsControlJustReleased(0, 38) and not isProcessing then - QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) - if result then - ProcessHeroin() - else - QBCore.Functions.Notify('You lack poppy resin', 'error') - end - end, 'poppyresin') - end - else - Citizen.Wait(500) - end - end -end) -]] function ProcessHeroin() @@ -80,8 +52,9 @@ function ProcessHeroin() isProcessing = false end -Citizen.CreateThread(function() - while true do +RegisterNetEvent("ps-drugprocessing:pickHeroin") +AddEventHandler("ps-drugprocessing:pickHeroin", function() + Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) @@ -95,11 +68,6 @@ Citizen.CreateThread(function() if nearbyObject and IsPedOnFoot(playerPed) then - if not isPickingUp then - QBCore.Functions.Draw2DText(0.5, 0.88, 'Press [~g~ E ~w~] to pickup poppy resin', 0.5) - end - - if IsControlJustReleased(0, 38) and not isPickingUp then isPickingUp = true TaskStartScenarioInPlace(playerPed, 'world_human_gardener_plant', 0, false) @@ -123,11 +91,9 @@ Citizen.CreateThread(function() end) isPickingUp = false - end else Citizen.Wait(500) end - end end) AddEventHandler('onResourceStop', function(resource) diff --git a/client/target.lua b/client/target.lua index 566a1fd..d3e7118 100644 --- a/client/target.lua +++ b/client/target.lua @@ -229,7 +229,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "ps-drugtrafficking:client:coke", + event = "ps-drugprocessing:pickCocaLeaves", icon = "fas fa-leaf", label = "Pickup Coke Leafs", }, @@ -240,7 +240,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "ps-drugtrafficking:client:heorin", + event = "ps-drugprocessing:pickHeroin", icon = "fas fa-seedling", label = "Pickup Poppy Plants", }, From 54a89435931aad214396252a4711bc672825b9ba Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Mon, 25 Apr 2022 04:30:26 -0400 Subject: [PATCH 6/7] Code cleanup & Core revert name change Made a mistake on the core name and general code clean up. --- client/chemicals.lua | 23 +---------------- client/coke.lua | 2 +- client/heroin.lua | 2 +- client/hydrochloricacid.lua | 2 +- client/lsd.lua | 43 ++------------------------------ client/meth.lua | 49 +------------------------------------ client/sodiumhydroxide.lua | 2 +- client/sulfuricacid.lua | 2 +- client/target.lua | 2 +- client/weed.lua | 30 +---------------------- server/chemicals.lua | 2 +- server/coke.lua | 2 +- server/heroin.lua | 2 +- server/lsd.lua | 2 +- server/meth.lua | 2 +- server/weed.lua | 3 +-- 16 files changed, 17 insertions(+), 153 deletions(-) diff --git a/client/chemicals.lua b/client/chemicals.lua index 886b810..698e31d 100644 --- a/client/chemicals.lua +++ b/client/chemicals.lua @@ -1,4 +1,4 @@ -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() local SpawnedChemicals = 0 local Chemicals = {} @@ -25,27 +25,6 @@ AddEventHandler('onResourceStop', function(resource) end end) ---[[Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - if GetDistanceBetweenCoords(coords, Config.CircleZones.ChemicalsConvertionMenu.coords, true) < 3 then - if not menuOpen then - local pos = GetEntityCoords(PlayerPedId()) - QBCore.Functions.DrawText3D(pos.x, pos.y, pos.z, "~g~E~w~ - Open chemical menu") - - if IsControlJustReleased(0, Keys['E']) then - TriggerEvent('ps-drugtrafficking:chemicalmenu') - end - else - Citizen.Wait(5500) - end - end - end -end)]]-- - -- Chemical Menu Trigger & Menu Button Triggers -- RegisterNetEvent('ps-drugtrafficking:chemicalmenu', function() diff --git a/client/coke.lua b/client/coke.lua index 602cfec..6a4f531 100644 --- a/client/coke.lua +++ b/client/coke.lua @@ -1,4 +1,4 @@ -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() local spawnedCocaLeaf = 0 local CocaPlants = {} diff --git a/client/heroin.lua b/client/heroin.lua index 4195a9c..fe6e733 100644 --- a/client/heroin.lua +++ b/client/heroin.lua @@ -1,7 +1,7 @@ local spawnedPoppys = 0 local PoppyPlants = {} local isPickingUp, isProcessing = false, false -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() Citizen.CreateThread(function() diff --git a/client/hydrochloricacid.lua b/client/hydrochloricacid.lua index 65c4af6..446ed7f 100644 --- a/client/hydrochloricacid.lua +++ b/client/hydrochloricacid.lua @@ -1,6 +1,6 @@ local spawnedHydrochloricAcidBarrels = 0 local HydrochloricAcidBarrels = {} -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() Citizen.CreateThread(function() while true do diff --git a/client/lsd.lua b/client/lsd.lua index 4bd51db..7a8452e 100644 --- a/client/lsd.lua +++ b/client/lsd.lua @@ -1,5 +1,5 @@ local isPickingUp, isProcessing, requiredItemsShowed, hasitem1, hasitem2 = false, false, false, false, false -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() Citizen.CreateThread(function() while true do @@ -93,46 +93,7 @@ Citizen.CreateThread(function() }, distance = 2.5 }) - end) - - ---[[ Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - if GetDistanceBetweenCoords(coords, Config.CircleZones.thionylchlorideProcessing.coords, true) < 5 then - if not isProcessing then - local pos = GetEntityCoords(PlayerPedId()) - QBCore.Functions.DrawText3D(pos.x, pos.y, pos.z, "E - Process Thionyl Chloride") - end - - if IsControlJustReleased(0, 38) and not isProcessing then - QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) - if result then - hasitem2 = true - else - QBCore.Functions.Notify('You lack some of the required items - LSA & Chemicals', 'error') - end - end, 'lsa') - - Citizen.Wait(1000) -- BUFFER - - QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) - if result and hasitem2 then - Processthionylchloride() - hasitem2 = false - else - QBCore.Functions.Notify('You lack some of the required items - LSA & Chemicals', 'error') - end - end, 'chemicals') - end - else - Citizen.Wait(1000) - end - end -end) ]] + end) function Processthionylchloride() isProcessing = true diff --git a/client/meth.lua b/client/meth.lua index db2c650..419fbae 100644 --- a/client/meth.lua +++ b/client/meth.lua @@ -1,53 +1,6 @@ local isProcessing, isTempChangeU, isTempChangeD, isBagging, hasitem1, hasitem2 = false, false, false, false, false, false local Methlab = false -local QBCore = exports['ps-core']:GetCoreObject() - ---[[Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - if GetDistanceBetweenCoords(coords, Config.CircleZones.MethProcessing.coords, true) < 5 then - if not isProcessing then - local pos = GetEntityCoords(PlayerPedId()) - QBCore.Functions.DrawText3D(pos.x, pos.y, pos.z, "E - Process Meth") - end - - if IsControlJustReleased(0, 38) and not isProcessing then - - QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) - if result then - hasitem1 = true - else - QBCore.Functions.Notify('You lack some of the required items - Hydrochloric Acid, Sulfuric Acid or Sodium Hydroxide', 'error') - end - end, 'sulfuric_acid') - Citizen.Wait(1000) -- BUFFER - - QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) - if result and hasitem1 then - hasitem2 = true - else - QBCore.Functions.Notify('You lack some of the required items - Hydrochloric Acid, Sulfuric Acid or Sodium Hydroxide', 'error') - end - end, 'hydrochloric_acid') - Citizen.Wait(1000) -- BUFFER - QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) - if result and hasitem2 then - ProcessMeth() - hasitem1 = false - hasitem2 = false - else - QBCore.Functions.Notify('You lack some of the required items - Hydrochloric Acid, Sulfuric Acid or Sodium Hydroxide', 'error') - end - end, 'sodium_hydroxide') - end - else - Citizen.Wait(500) - end - end -end)]]-- +local QBCore = exports['qb-core']:GetCoreObject() RegisterNetEvent('ps-drugprocessing:ProcessChemicals') AddEventHandler('ps-drugprocessing:ProcessChemicals', function() diff --git a/client/sodiumhydroxide.lua b/client/sodiumhydroxide.lua index 9017acf..e30d4e4 100644 --- a/client/sodiumhydroxide.lua +++ b/client/sodiumhydroxide.lua @@ -1,6 +1,6 @@ local spawnedSodiumHydroxideBarrels = 0 local SodiumHydroxideBarrels = {} -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() Citizen.CreateThread(function() while true do diff --git a/client/sulfuricacid.lua b/client/sulfuricacid.lua index 6335f57..95453da 100644 --- a/client/sulfuricacid.lua +++ b/client/sulfuricacid.lua @@ -1,6 +1,6 @@ local spawnedSulfuricAcidBarrels = 0 local SulfuricAcidBarrels = {} -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() Citizen.CreateThread(function() while true do diff --git a/client/target.lua b/client/target.lua index d3e7118..a1daeac 100644 --- a/client/target.lua +++ b/client/target.lua @@ -1,4 +1,4 @@ -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() Citizen.CreateThread(function() exports['qb-target']:SpawnPed({ diff --git a/client/weed.lua b/client/weed.lua index ee2d6c1..d91f07b 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -1,7 +1,7 @@ local spawnedWeeds = 0 local weedPlants = {} local isPickingUp, isProcessing = false, false -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() @@ -18,34 +18,6 @@ Citizen.CreateThread(function() end end end) ---[[ -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - if GetDistanceBetweenCoords(coords, Config.CircleZones.WeedProcessing.coords, true) < 2 then - if not isProcessing then - local pos = GetEntityCoords(PlayerPedId()) - QBCore.Functions.DrawText3D(pos.x, pos.y, pos.z, "~g~E~w~ -Trim weed") - end - - if IsControlJustReleased(0, 38) and not isProcessing then - QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result) - if result then - ProcessWeed() - else - QBCore.Functions.Notify('You lack unprocessed weed', 'error') - end - end, 'cannabis') - end - else - Citizen.Wait(500) - end - end -end) -]] function ProcessWeed() isProcessing = true diff --git a/server/chemicals.lua b/server/chemicals.lua index 6be2cb7..ec33446 100644 --- a/server/chemicals.lua +++ b/server/chemicals.lua @@ -1,4 +1,4 @@ -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() local playersProcessingChemicalsToHydrochloricAcid = {} diff --git a/server/coke.lua b/server/coke.lua index 4376223..497ad93 100644 --- a/server/coke.lua +++ b/server/coke.lua @@ -1,5 +1,5 @@ local playersProcessingCocaLeaf = {} -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() RegisterServerEvent('ps-drugtrafficking:pickedUpCocaLeaf') AddEventHandler('ps-drugtrafficking:pickedUpCocaLeaf', function() diff --git a/server/heroin.lua b/server/heroin.lua index affdea5..485bb58 100644 --- a/server/heroin.lua +++ b/server/heroin.lua @@ -1,5 +1,5 @@ local playersProcessingPoppyResin = {} -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() RegisterServerEvent('ps-drugtrafficking:pickedUpPoppy') AddEventHandler('ps-drugtrafficking:pickedUpPoppy', function() diff --git a/server/lsd.lua b/server/lsd.lua index cae7d27..3d832b6 100644 --- a/server/lsd.lua +++ b/server/lsd.lua @@ -1,5 +1,5 @@ local playersProcessingLSD = {} -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() RegisterServerEvent('ps-drugtrafficking:Processlsd') AddEventHandler('ps-drugtrafficking:Processlsd', function() diff --git a/server/meth.lua b/server/meth.lua index 8d5c615..4a4a8ad 100644 --- a/server/meth.lua +++ b/server/meth.lua @@ -1,5 +1,5 @@ local playersProcessingMeth = {} -local QBCore = exports['ps-core']:GetCoreObject() +local QBCore = exports['qb-core']:GetCoreObject() RegisterServerEvent('ps-drugtrafficking:pickedUpHydrochloricAcid') AddEventHandler('ps-drugtrafficking:pickedUpHydrochloricAcid', function() diff --git a/server/weed.lua b/server/weed.lua index 3e42621..c3ab940 100644 --- a/server/weed.lua +++ b/server/weed.lua @@ -1,5 +1,4 @@ -local QBCore = exports['ps-core']:GetCoreObject() - +local QBCore = exports['qb-core']:GetCoreObject() local playersProcessingCannabis = {} RegisterServerEvent('ps-drugtrafficking:pickedUpCannabis') From fcf2f38bc113e225a016d2324479db83425e9bf7 Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Mon, 25 Apr 2022 04:35:55 -0400 Subject: [PATCH 7/7] Events Cleanup --- client/chemicals.lua | 4 ++-- client/sodiumhydroxide.lua | 4 ++-- client/sulfuricacid.lua | 4 ++-- client/target.lua | 8 ++++---- client/weed.lua | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/chemicals.lua b/client/chemicals.lua index 698e31d..cdae7f5 100644 --- a/client/chemicals.lua +++ b/client/chemicals.lua @@ -265,8 +265,8 @@ function process_hydrochloric_acid() end -RegisterNetEvent("ps-drugtrafficking:chemicals") -AddEventHandler("ps-drugtrafficking:chemicals", function() +RegisterNetEvent("ps-drugtrafficking:pickChemicals") +AddEventHandler("ps-drugtrafficking:pickChemicals", function() Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) diff --git a/client/sodiumhydroxide.lua b/client/sodiumhydroxide.lua index e30d4e4..b153080 100644 --- a/client/sodiumhydroxide.lua +++ b/client/sodiumhydroxide.lua @@ -16,8 +16,8 @@ Citizen.CreateThread(function() end end) -RegisterNetEvent("ps-drugtrafficking:client:sodium") -AddEventHandler("ps-drugtrafficking:client:sodium", function() +RegisterNetEvent("ps-drugtrafficking:pickSodium") +AddEventHandler("ps-drugtrafficking:pickSodium", function() Citizen.Wait(0) local playerPe3 = PlayerPedId() local coords = GetEntityCoords(playerPe3) diff --git a/client/sulfuricacid.lua b/client/sulfuricacid.lua index 95453da..0a41916 100644 --- a/client/sulfuricacid.lua +++ b/client/sulfuricacid.lua @@ -16,8 +16,8 @@ Citizen.CreateThread(function() end end) -RegisterNetEvent("ps-drugtrafficking:client:sulfuric") -AddEventHandler("ps-drugtrafficking:client:sulfuric", function() +RegisterNetEvent("ps-drugtrafficking:pickSulfuric") +AddEventHandler("ps-drugtrafficking:pickSulfuric", function() Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) diff --git a/client/target.lua b/client/target.lua index a1daeac..5b0b9eb 100644 --- a/client/target.lua +++ b/client/target.lua @@ -251,7 +251,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "ps-drugtrafficking:client:weed", + event = "ps-drugtrafficking:pickWeed", icon = "fas fa-envira", label = "Pickup Weed Leafs", }, @@ -262,7 +262,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "ps-drugtrafficking:client:sodium", + event = "ps-drugtrafficking:pickSodium", icon = "fas fa-dna", label = "Pickup Sodium Barrel", }, @@ -273,7 +273,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "ps-drugtrafficking:client:sulfuric", + event = "ps-drugtrafficking:pickSulfuric", icon = "fas fa-shield-virus", label = "Pickup Sulfuric Barrel", }, @@ -284,7 +284,7 @@ Citizen.CreateThread(function() options = { { type = "client", - event = "ps-drugtrafficking:chemicals", + event = "ps-drugtrafficking:pickChemicals", icon = "fas fa-radiation", label = "Pickup Chem Barrels", }, diff --git a/client/weed.lua b/client/weed.lua index d91f07b..47a5014 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -51,8 +51,8 @@ function ProcessWeed() isProcessing = false end -RegisterNetEvent("ps-drugtrafficking:client:weed") -AddEventHandler("ps-drugtrafficking:client:weed", function() +RegisterNetEvent("ps-drugtrafficking:pickWeed") +AddEventHandler("ps-drugtrafficking:pickWeed", function() Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed)