diff --git a/client/cocaine.lua b/client/cocaine.lua index fbf6992..f483e76 100644 --- a/client/cocaine.lua +++ b/client/cocaine.lua @@ -120,10 +120,7 @@ for k, v in pairs (locations.MakePowder) do label = Bridge.Language.Locale('coke.targetMakePow'), icon = Bridge.Language.Locale('coke.targetMakePowIcon'), action = function() - if not Bridge.Inventory.HasItem('coca_leaf') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('coca_leaf').label), 'error') - return - end + if not itemCheck('coca_leaf') then return end if not progressbar(Bridge.Language.Locale('coke.makePow')) then return end TriggerServerEvent("md-drugs:server:makepowder", k) end, @@ -140,10 +137,7 @@ for k, v in pairs (locations.CuttingCoke) do label = Bridge.Language.Locale('coke.targetCutCoke'), icon = Bridge.Language.Locale('coke.targetCutCokeIcon'), action = function() - if not Bridge.Inventory.HasItem('bakingsoda') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('bakingsoda').label), 'error') - return - end + if not itemCheck('baking_soda') then return end CutCoke(v.loc, v.offset, v.rotation) TriggerServerEvent("md-drugs:server:cutcokeone", k) end, @@ -162,10 +156,7 @@ for k, v in pairs (locations.BaggingCoke) do label = Bridge.Language.Locale('coke.targetBagCoke'), icon = Bridge.Language.Locale('coke.targetBagCokeIcon'), action = function() - if not Bridge.Inventory.HasItem('empty_weed_bag') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('empty_weed_bag').label), 'error') - return - end + if not itemCheck('empty_weed_bag') then return end BagCoke(v.loc, v.offset, v.rotation) TriggerServerEvent("md-drugs:server:bagcoke", k) end, diff --git a/client/crack.lua b/client/crack.lua index 1edd8c5..2360d74 100644 --- a/client/crack.lua +++ b/client/crack.lua @@ -6,10 +6,7 @@ for k, v in pairs (locations.makecrack) do label = Bridge.Language.Locale('crack.targetMake'), icon = 'fa-solid fa-temperature-high', action = function() - if not Bridge.Inventory.HasItem('bakingsoda') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('bakingsoda').label), 'error') - return - end + if not itemCheck('baking_soda') then return end if not minigame() then TriggerServerEvent("md-drugs:server:failcrackone", k) return @@ -31,10 +28,7 @@ for k, v in pairs (locations.bagcrack) do label = Bridge.Language.Locale('crack.targetBag'), icon = 'fa-solid fa-weight-scale', action = function() - if not Bridge.Inventory.HasItem('empty_weed_bag') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('empty_weed_bag').label), 'error') - return - end + if not itemCheck('empty_weed_bag') then return end if not progressbar(Bridge.Language.Locale('crack.bag')) then return end TriggerServerEvent("md-drugs:server:bagcrack", k) end, diff --git a/client/functions.lua b/client/functions.lua index 0b58521..aabb170 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -314,3 +314,11 @@ function progressbar(text, time, emote, cancel) }) return success end + +function itemCheck(item) + if not Bridge.Inventory.HasItem(item) then + Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo(item).label), 'error') + return false + end + return true +end \ No newline at end of file diff --git a/client/heroin.lua b/client/heroin.lua index 53dc0de..ef94687 100644 --- a/client/heroin.lua +++ b/client/heroin.lua @@ -12,10 +12,7 @@ local function createLabKit(coord, head) icon = "fa-solid fa-temperature-high", label = Bridge.Language.Locale('heroin.targetCook'), action = function() - if not Bridge.Inventory.HasItem('emptyvial') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('emptyvial').label), 'error') - return - end + if not itemCheck('empty_vial') then return end if not minigame() then dirty = true @@ -51,10 +48,7 @@ local function createLabKit(coord, head) icon = "fa-solid fa-hand-sparkles", label = Bridge.Language.Locale('heroin.targetClean'), action = function() - if not Bridge.Inventory.HasItem('cleaningkit') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('cleaningkit').label), 'error') - return - end + if not itemCheck('cleaningkit') then return end if not progressbar(Bridge.Language.Locale('heroin.pbClean'), 4000, 'clean') then return end local done = Bridge.Callback.Trigger('md-drugs:server:removeCleaningKitHeroin', false) if done then dirty = false end @@ -88,10 +82,7 @@ for k, v in pairs (locations.cutheroinone) do label = Bridge.Language.Locale('heroin.targetCutHeroin'), icon = 'fa-solid fa-seedling', action = function() - if not Bridge.Inventory.HasItem('bakingsoda') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo('bakingsoda').label), 'error') - return - end + if not itemCheck('baking_soda') then return end if not progressbar(Bridge.Language.Locale('heroin.pbCutHeroin')) then return end TriggerServerEvent("md-drugs:server:cutheroin", k) end, diff --git a/client/lsd.lua b/client/lsd.lua index 2adbbf0..622b191 100644 --- a/client/lsd.lua +++ b/client/lsd.lua @@ -33,10 +33,7 @@ local function createLabKit(coord, head) icon = "fa-solid fa-temperature-high", label = Bridge.Language.Locale('lsd.targetRefine'), action = function() - if not Bridge.Inventory.HasItem('lsd_one_vial') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemNeeded', Bridge.Inventory.GetItemInfo('lsd_one_vial').label), 'error') - return - end + if not itemCheck('lsd_one_vial') then return end if not minigame() then TriggerServerEvent("md-drugs:server:failrefinequality") return end if not progressbar(Bridge.Language.Locale('lsd.refining')) then return end TriggerServerEvent("md-drugs:server:refinequalityacid") @@ -49,10 +46,7 @@ local function createLabKit(coord, head) icon = "fa-regular fa-note-sticky", label = Bridge.Language.Locale('lsd.targetDipping'), action = function() - if not Bridge.Inventory.HasItem('tab_paper') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemNeeded', Bridge.Inventory.GetItemInfo('tab_paper').label), 'error') - return - end + if not itemCheck('tab_paper') then return end if not minigame() then TriggerServerEvent("md-drugs:server:failtabs") return end if not progressbar(Bridge.Language.Locale('lsd.dipping')) then return end TriggerServerEvent("md-drugs:server:maketabpaper") @@ -78,10 +72,7 @@ local function createLabKit(coord, head) icon = "fa-solid fa-hand-sparkles", label = Bridge.Language.Locale('lsd.targetClean'), action = function() - if not Bridge.Inventory.HasItem('cleaningkit') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemNeeded', Bridge.Inventory.GetItemInfo('cleaningkit').label), 'error') - return - end + if not itemCheck('cleaningkit') then return end if not progressbar(Bridge.Language.Locale('lsd.cleaning'), 4000, 'clean') then return end local check = Bridge.Callback.Trigger('md-drugs:server:removecleaningkit') if check then diff --git a/client/mescaline.lua b/client/mescaline.lua index 227ffbb..4649584 100644 --- a/client/mescaline.lua +++ b/client/mescaline.lua @@ -20,10 +20,7 @@ for k, v in pairs (locations.DryOutMescaline) do label = Bridge.Language.Locale('mesc.targetDry'), icon = 'fa-solid fa-temperature-high', action = function() - if not Bridge.Inventory.HasItem('cactusbulb') then - Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemNeeded', Bridge.Inventory.GetItemInfo('cactusbulb').label), 'error') - return - end + if not itemCheck('cactusbulb') then return end if not progressbar(Bridge.Language.Locale('mescaline.dry')) then return end TriggerServerEvent("md-drugs:server:drymescaline", k) end, diff --git a/client/weed.lua b/client/weed.lua index 1d9b3a0..ccfdebd 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -6,10 +6,7 @@ for k, v in pairs (locations.WeedDry) do icon = 'fa-solid fa-cannabis', label = Bridge.Language.Locale('weed.targetDry'), action = function() - if not Bridge.Inventory.HasItem( "wetcannabis") then - Bridge.Notify.SendNotify(Bridge.Language.Locale('weed.noDry'), "error") - return - end + if not itemCheck("wetcannabis") then return end if drying then return end local loc = GetEntityCoords(PlayerPedId()) local weedplant = CreateObject("bkr_prop_weed_drying_01a", loc.x, loc.y+.2, loc.z, true, false)