From cc33ecb7e29678e4307928acb854215e80e0938c Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Mon, 25 Nov 2024 19:57:26 -0800 Subject: [PATCH] punctuation --- client/consumables.lua | 38 ++++++++++---------- client/crack.lua | 3 +- client/deliveries.lua | 4 +-- client/functions.lua | 2 -- client/lsd.lua | 1 - client/target.lua | 2 +- client/weed.lua | 12 +++---- client/wholesale.lua | 82 +++++++++++++++++++++--------------------- client/xtc.lua | 21 +++++------ server/heroin.lua | 8 ----- server/locations.lua | 2 ++ server/recipes.lua | 47 ++++++++++++------------ 12 files changed, 101 insertions(+), 121 deletions(-) diff --git a/client/consumables.lua b/client/consumables.lua index 8880f00..ad9fd81 100644 --- a/client/consumables.lua +++ b/client/consumables.lua @@ -23,23 +23,23 @@ RegisterNetEvent('md-drugs:client:consumedrugs', function(time, effect, anim, pr end) RegisterNetEvent('md-drugs:client:recievebuff', function(type, amount) -if type == 'speed' then - local count = 0 - SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.49) - repeat - count = count + 1 - Wait(1000) - until count == amount - SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.00) -end -if type == 'strength' then - local strength = 0 - SetCurrentPedWeapon(PlayerPedId(), 'weapon_unarmed', true) - SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 50.0) - repeat - strength = strength + 1 - Wait(1000) - until strength == amount - SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 1.0) -end + if type == 'speed' then + local count = 0 + SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.49) + repeat + count = count + 1 + Wait(1000) + until count == amount + SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.00) + end + if type == 'strength' then + local strength = 0 + SetCurrentPedWeapon(PlayerPedId(), 'weapon_unarmed', true) + SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 50.0) + repeat + strength = strength + 1 + Wait(1000) + until strength == amount + SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 1.0) + end end) diff --git a/client/crack.lua b/client/crack.lua index d7a9f14..4476308 100644 --- a/client/crack.lua +++ b/client/crack.lua @@ -11,5 +11,4 @@ RegisterNetEvent("md-drugs:client:bagcrack", function(data) if not ItemCheck('empty_weed_bag') then return end if not progressbar(Lang.Crack.bagcrack, 4000, 'uncuff') then return end TriggerServerEvent("md-drugs:server:bagcrack", data.data) -end) - +end) \ No newline at end of file diff --git a/client/deliveries.lua b/client/deliveries.lua index 5c03cc2..b32ae7e 100644 --- a/client/deliveries.lua +++ b/client/deliveries.lua @@ -10,7 +10,7 @@ end) local function SpawnDealer() local getDealers = lib.callback.await('md-drugs:server:getDealers', false) - for k,v in pairs(getDealers) do + for k,v in pairs(getDealers) do local Ped = "g_m_y_famdnf_01" lib.requestModel(Ped, Config.RequestModelTime) local loc = json.decode(v.coords) @@ -29,7 +29,7 @@ local function SpawnDealer() { icon = "fa-solid fa-store", label = string.format(Lang.targets.Delivery.open, v.name), action = function() TriggerEvent('md-drugs:client:opendealermenu') end, }}, dealer[k]) - end + end end RegisterNetEvent('md-drugs:client:RefreshDealers', function() diff --git a/client/functions.lua b/client/functions.lua index 27dc9ca..671d4dd 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -475,7 +475,6 @@ end function AddBoxZoneMultiOptions(name, loc, data) local options = {} for k, v in pairs (data) do - table.insert(options, { icon = v.icon or "fa-solid fa-eye", label = v.label, event = v.event or nil, action = v.action or nil, onSelect = v.action,data = v.data,canInteract = v.canInteract or nil, distance = 2.0, @@ -616,7 +615,6 @@ RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(3000) LoadModel('prop_plant_01b') LoadModel('prop_plant_01a') LoadModel('prop_cactus_03') LoadModel('bkr_prop_weed_lrg_01b') local check = lib.callback.await('md-drugs:server:GetRep', false) - return end) diff --git a/client/lsd.lua b/client/lsd.lua index df21000..998d319 100644 --- a/client/lsd.lua +++ b/client/lsd.lua @@ -100,7 +100,6 @@ RegisterNetEvent("md-drugs:client:buytabs", function(data) TriggerServerEvent("md-drugs:server:gettabpaper", data.data) end) - RegisterNetEvent("md-drugs:client:buylabkit", function() if QBCore.Functions.HasItem('lsdlabkit') then Notify(Lang.lsd.hav, 'error') return end if not progressbar(Lang.lsd.buykit, 4000, 'uncuff') then return end diff --git a/client/target.lua b/client/target.lua index 25e6ef1..a73bdb9 100644 --- a/client/target.lua +++ b/client/target.lua @@ -3,7 +3,7 @@ local icon = "fa solid fa-eye" CreateThread(function() local config = lib.callback.await('md-drugs:server:getLocs', false) - if not config then return end + if not config then print('Yo Dawg You Broke Your Locations.lua') return end AddBoxZoneSingle('telecokein', config.singleSpot.CokeTeleIn, {action = function()tele(config.singleSpot.CokeTeleOut)end, icon = 'fa-solid fa-door-open', label = Lang.targets.coke.enter}) -- coke AddBoxZoneSingle('telecokeout', config.singleSpot.CokeTeleOut, {action = function()tele(config.singleSpot.CokeTeleIn) end, icon = "fa-solid fa-door-closed", label = Lang.targets.coke.exit}) -- coke AddBoxZoneMulti('makepowder', config.MakePowder, {event = "md-drugs:client:makepowder", icon = "fa-solid fa-scissors", label = Lang.targets.coke.chop}) -- coke diff --git a/client/weed.lua b/client/weed.lua index b7dc18d..a4f0f88 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -100,7 +100,7 @@ AddBoxZoneSingle('MakeButterCrafting', config.singleSpot.MakeButter, {label = La canInteract = function() if hasJob() then return true end end }) - AddBoxZoneSingle('makeoil',config.singleSpot.MakeOil, { +AddBoxZoneSingle('makeoil',config.singleSpot.MakeOil, { name = 'Oil', icon = "fa-solid fa-oil-can", label = Lang.targets.weed.oil, @@ -142,8 +142,8 @@ CreateThread(function() end) RegisterNetEvent("md-drugs:client:dodabs", function() -if not progressbar('Doing Dabs', 4000, 'bong2') then AlienEffect() return end -AlienEffect() + if not progressbar('Doing Dabs', 4000, 'bong2') then AlienEffect() return end + AlienEffect() end) local function createBluntOptions(contextId, contextTitle, eventLabelPrefix, tableName) @@ -169,11 +169,7 @@ local function createBluntOptions(contextId, contextTitle, eventLabelPrefix, tab } end sorter(options, 'title') - lib.registerContext({ - id = contextId, - title = contextTitle, - options = options - }) + lib.registerContext({ id = contextId, title = contextTitle, options = options}) end CreateThread(function() diff --git a/client/wholesale.lua b/client/wholesale.lua index 2882206..faef517 100644 --- a/client/wholesale.lua +++ b/client/wholesale.lua @@ -2,48 +2,48 @@ local QBCore = exports['qb-core']:GetCoreObject() local miss = false RegisterNetEvent("md-drugs:client:GetLocation", function(drug) - if not GetCops(Config.PoliceCount) then return end - if miss then - Notify(Lang.Wholesale.al, 'error') - else - local loc = drug.location - local timer = 0 - miss = true - SetNewWaypoint(loc.x, loc.y) - lib.requestModel("g_m_y_famdnf_01", Config.RequestModelTime) - local current = "g_m_y_famdnf_01" - local drugdealer = CreatePed(0, current,loc.x,loc.y,loc.z-1, 90.0, false, false) - FreezeEntityPosition(drugdealer, true) - SetEntityInvincible(drugdealer, true) - AddMultiModel(drugdealer, {{ - label = Lang.targets.Wholesale.talk, - icon = "fas fa-eye", - action = function() - local luck = math.random(1,100) - if luck <= Config.SuccessfulChance then - if not progressbar("Wholesaling Drugs", 4000, 'uncuff') then return end - TriggerServerEvent("md-drugs:server:SuccessSale", drug) - else - progressbar("YOU FUCKED NOW", 4000, 'uncuff') - SetUpPeds() - end - Wait(3000) - DeleteEntity(drugdealer) - miss = false - end - }},drugdealer ) - repeat - Wait(1000) - timer = timer + 1 - until #(GetEntityCoords(PlayerPedId()) - vector3(loc.x, loc.y, loc.z) ) < 4.0 or timer == Config.WholesaleTimeout + 1 - PoliceCall(Config.AlertPoliceWholesale) - if timer <= Config.WholesaleTimeout or #(GetEntityCoords(PlayerPedId()) - vector3(loc.x, loc.y, loc.z) ) < 4.0 then - timer = 0 - else - Notify('The Buyer Waited To Long', 'error') - DeleteEntity(drugdealer) + if not GetCops(Config.PoliceCount) then return end + if miss then + Notify(Lang.Wholesale.al, 'error') + else + local loc = drug.location + local timer = 0 + miss = true + SetNewWaypoint(loc.x, loc.y) + lib.requestModel("g_m_y_famdnf_01", Config.RequestModelTime) + local current = "g_m_y_famdnf_01" + local drugdealer = CreatePed(0, current,loc.x,loc.y,loc.z-1, 90.0, false, false) + FreezeEntityPosition(drugdealer, true) + SetEntityInvincible(drugdealer, true) + AddMultiModel(drugdealer, {{ + label = Lang.targets.Wholesale.talk, + icon = "fas fa-eye", + action = function() + local luck = math.random(1,100) + if luck <= Config.SuccessfulChance then + if not progressbar("Wholesaling Drugs", 4000, 'uncuff') then return end + TriggerServerEvent("md-drugs:server:SuccessSale", drug) + else + progressbar("YOU FUCKED NOW", 4000, 'uncuff') + SetUpPeds() + end + Wait(3000) + DeleteEntity(drugdealer) + miss = false + end + }},drugdealer ) + repeat + Wait(1000) + timer = timer + 1 + until #(GetEntityCoords(PlayerPedId()) - vector3(loc.x, loc.y, loc.z) ) < 4.0 or timer == Config.WholesaleTimeout + 1 + PoliceCall(Config.AlertPoliceWholesale) + if timer <= Config.WholesaleTimeout or #(GetEntityCoords(PlayerPedId()) - vector3(loc.x, loc.y, loc.z) ) < 4.0 then + timer = 0 + else + Notify('The Buyer Waited To Long', 'error') + DeleteEntity(drugdealer) + end end -end end) diff --git a/client/xtc.lua b/client/xtc.lua index 6ad6c56..1813cbe 100644 --- a/client/xtc.lua +++ b/client/xtc.lua @@ -27,13 +27,13 @@ lib.callback.register('md-drugs:client:setpress', function(type) if xtcpress then Notify(Lang.xtc.out, 'error') return false -else - local coords, head = StartRay2() - xtcpress = true - progressbar('Setting Press On The Ground', 4000, 'uncuff') - local press = CreateObject("bkr_prop_coke_press_01aa", coords.x, coords.y, coords.z, true, false, false) - PlaceObjectOnGroundProperly(press) - Freeze(press, true, head) + else + local coords, head = StartRay2() + xtcpress = true + progressbar('Setting Press On The Ground', 4000, 'uncuff') + local press = CreateObject("bkr_prop_coke_press_01aa", coords.x, coords.y, coords.z, true, false, false) + PlaceObjectOnGroundProperly(press) + Freeze(press, true, head) local options = { { icon = "fa-solid fa-tablets", label = Lang.targets.xtc.make, distance = 2.0, action = function() TriggerEvent("md-drugs:client:XTCMenu", type) end, canInteract = function() if xtcpress then return true end end @@ -44,7 +44,7 @@ else } AddMultiModel(press, options, nil) return true, GetEntityCoords(press) -end + end end) RegisterNetEvent("md-drugs:client:XTCMenu", function(type) @@ -75,14 +75,12 @@ RegisterNetEvent("md-drugs:client:stealisosafrole", function(data) TriggerServerEvent("md-drugs:server:stealisosafrole",data.data) end) - RegisterNetEvent("md-drugs:client:stealmdp2p", function(data) if not minigame() then Notify(Lang.xtc.fail, "error") return end if not progressbar(Lang.xtc.mdp2p, 4000, 'uncuff') then return end TriggerServerEvent("md-drugs:server:stealmdp2p", data.data) end) - RegisterNetEvent("md-drugs:client:makingrawxtc", function(data) if not ItemCheck('isosafrole') then return end if not ItemCheck('mdp2p') then return end @@ -96,8 +94,6 @@ RegisterNetEvent("md-drugs:client:MakeXTC", function(data) TriggerServerEvent("md-drugs:server:makextc",data) end) ------------------------------------------------------------------- Stamping - RegisterNetEvent("md-drugs:client:stampwhite", function(data) lib.registerContext({ id = 'stampxtc', title = 'Stamp XTC Menu', options = { @@ -134,7 +130,6 @@ RegisterNetEvent("md-drugs:client:stampwhite", function(data) lib.showContext('stampxtc') end) - RegisterNetEvent("md-drugs:client:getsinglepress", function() if not progressbar(Lang.xtc.buyp, 4000, 'uncuff') then return end TriggerServerEvent("md-drugs:server:buypress") diff --git a/server/heroin.lua b/server/heroin.lua index af512b5..ee7cb79 100644 --- a/server/heroin.lua +++ b/server/heroin.lua @@ -26,7 +26,6 @@ Citizen.CreateThread(function() end end) - function heroinCooldown(loc) CreateThread(function() Wait(Config.respawnTime * 1000) @@ -48,7 +47,6 @@ local src = source end end) - RegisterServerEvent("heroin:pickupCane", function(loc) if not h[loc].taken then h[loc].taken = true @@ -77,7 +75,6 @@ RegisterServerEvent('md-drugs:server:dryplant', function(num) end end) - RegisterServerEvent('md-drugs:server:cutheroin', function(num) local src = source local Player = getPlayer(src) @@ -153,8 +150,6 @@ QBCore.Functions.CreateUseableItem('heroinlabkit', function(source, item) end end) - - RegisterServerEvent('md-drugs:server:heatliquidheroin', function() local src = source local Player = getPlayer(src) @@ -197,7 +192,6 @@ local cuth3 = Player.Functions.GetItemByName('heroincutstagethree') end end) - RegisterServerEvent('md-drugs:server:fillneedle', function(num) local src = source local Player = getPlayer(src) @@ -225,8 +219,6 @@ RegisterServerEvent('md-drugs:server:fillneedle', function(num) end end) - - RegisterServerEvent('md-drugs:server:failheroin', function() local src = source local Player = getPlayer(src) diff --git a/server/locations.lua b/server/locations.lua index e21436a..41afd14 100644 --- a/server/locations.lua +++ b/server/locations.lua @@ -131,10 +131,12 @@ function checkLoc(source, event, num) return false end end + local loc = Target.Travellingmerchant[math.random(1, #Target.Travellingmerchant)] lib.callback.register('md-drugs:server:getLocs', function() return Target end) + lib.callback.register('md-drugs:server:GetMerchant', function(source) return loc end) diff --git a/server/recipes.lua b/server/recipes.lua index 867b6ac..bf0fae3 100644 --- a/server/recipes.lua +++ b/server/recipes.lua @@ -140,31 +140,30 @@ function GetRecipe(source, type, method, tier) local Player = getPlayer(source) local has = 0 local need = 0 - for k, v in pairs (recipe[type][method][tier].take) do - local item = Player.Functions.GetItemByName(k) - if item and item.amount >= v then - has = has + 1 - else - Notifys(src, ' You Need ' .. v .. ' Of ' .. GetLabels(k) .. ' To Do This', 'error') - end - need = need + 1 - end - if has == need then - for k, v in pairs (recipe[type][method][tier].take) do - RemoveItem(src, k, v) - end - for k,v in pairs (recipe[type][method][tier].give) do - AddItem(src, k, v) - Log(GetName(src) .. ' Made ' .. GetLabels(k) .. '!', 'drugMaking') - end - - return true + for k, v in pairs (recipe[type][method][tier].take) do + local item = Player.Functions.GetItemByName(k) + if item and item.amount >= v then + has = has + 1 else - return false + Notifys(src, ' You Need ' .. v .. ' Of ' .. GetLabels(k) .. ' To Do This', 'error') end - end - + need = need + 1 + end + if has == need then + for k, v in pairs (recipe[type][method][tier].take) do + RemoveItem(src, k, v) + end + for k,v in pairs (recipe[type][method][tier].give) do + AddItem(src, k, v) + Log(GetName(src) .. ' Made ' .. GetLabels(k) .. '!', 'drugMaking') + end + return true + else + return false + end +end + lib.callback.register('md-drugs:server:GetRecipe', function(source, type, cat) -if not source then return false end -return recipe[type][cat] + if not source then return false end + return recipe[type][cat] end) \ No newline at end of file