Merge pull request #26 from Alivemonstor/main

Meth Item Checks and Weed

Author: MonkeyWhisper

client/meth.lua

@@ -48,17 +48,24 @@ end)
 RegisterNetEvent('ps-drugprocessing:ChangeTemp')
 AddEventHandler('ps-drugprocessing:ChangeTemp', function()
 	if not isTempChangeU then
-		exports["memorygame"]:thermiteminigame(6, 3, 5, 10,
-		function() -- success
-			print("success")
-			QBCore.Functions.Notify('Temperature Increase Successful', 'success')
-			ProcessTempUp()
-		end,
-		function() -- failure
-			print("failure")
-			TriggerServerEvent('ps-drugprocessing:cancelProcessing')
-			TriggerServerEvent('ps-drugprocessing:processFailUp')
-		end)
+		QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result)
+			if result then
+				print('You have this item HA')
+				exports["memorygame"]:thermiteminigame(6, 3, 5, 10,
+				function() -- success
+					print("success")
+					QBCore.Functions.Notify('Temperature Increase Successful', 'success')
+					ProcessTempUp()
+				end,
+				function() -- failure
+					print("failure")
+					TriggerServerEvent('ps-drugprocessing:cancelProcessing')
+					TriggerServerEvent('ps-drugprocessing:processFailUp')
+				end)
+			else
+				QBCore.Functions.Notify('You lack some of the required items - Chemical Mix', 'error')
+			end
+		end, 'liquidmix')
 	else
 		QBCore.Functions.Notify('Temperature is Already Hot Enough', 'error')
 	end
@@ -67,22 +74,30 @@ end)
 RegisterNetEvent('ps-drugprocessing:ChangeTemp2')
 AddEventHandler('ps-drugprocessing:ChangeTemp2', function()
 	if not isTempChangeD then
-		exports["memorygame"]:thermiteminigame(6, 3, 5, 10,
-		function() -- success
-			print("success")
-			QBCore.Functions.Notify('Temperature Decrease Successful', 'success')
-			ProcessTempDown()
-		end,
-		function() -- failure
-			print("failure")
-			TriggerServerEvent('ps-drugprocessing:cancelProcessing')
-			TriggerServerEvent('ps-drugprocessing:processFailDown')
-		end)
+		QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result)
+			if result then
+				print('You have this item HA')
+				exports["memorygame"]:thermiteminigame(6, 3, 5, 10,
+				function() -- success
+					print("success")
+					QBCore.Functions.Notify('Temperature Decrease Successful', 'success')
+					ProcessTempUp()
+				end,
+				function() -- failure
+					print("failure")
+					TriggerServerEvent('ps-drugprocessing:cancelProcessing')
+					TriggerServerEvent('ps-drugprocessing:processFailDown')
+				end)
+			else
+				QBCore.Functions.Notify('You lack some of the required items - Chemical Vapor', 'error')
+			end
+		end, 'chemicalvapor')
 	else
-		QBCore.Functions.Notify('Temperature is Already Hot Enough', 'error')
+		QBCore.Functions.Notify('Temperature is Already Cold Enough', 'error')
 	end
 end)
 
+
 RegisterNetEvent('ps-drugprocessing:ProcessProduct')
 AddEventHandler('ps-drugprocessing:ProcessProduct', function()
 	local coords = GetEntityCoords(PlayerPedId(source))
@@ -326,4 +341,4 @@ function OpenDoorAnimation()
     TaskPlayAnim(ped, "anim@heists@keycard@", "exit", 5.0, 1.0, -1, 16, 0, 0, 0, 0)
     Citizen.Wait(400)
     ClearPedTasks(ped)
-end
+end

client/weed.lua

@@ -53,7 +53,14 @@ end
 
 RegisterNetEvent("ps-drugprocessing:processWeed")
 AddEventHandler("ps-drugprocessing:processWeed",function()
-	ProcessWeed()
+	QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result)
+		if result then
+			print('You have this item HA')
+			ProcessWeed()
+		else
+			QBCore.Functions.Notify("You don't have any cannabis!", 'error')
+		end
+	end,'cannabis')
 end)
 
 RegisterNetEvent("ps-drugprocessing:pickWeed")