From 11e3b5efe60520ed4364829b8e787ba2087c73fd Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:46:27 -0800 Subject: [PATCH] update --- client/animationsandfunctions.lua | 2 +- client/functions.lua | 16 ++++++---------- client/meth.lua | 2 +- client/travellingmerchant.lua | 2 +- server/functions.lua | 6 ++---- server/lean.lua | 15 ++++++--------- server/wholesale.lua | 22 +++++++--------------- shared/english.lua | 6 +++++- 8 files changed, 29 insertions(+), 42 deletions(-) diff --git a/client/animationsandfunctions.lua b/client/animationsandfunctions.lua index acbda8b..521d52b 100644 --- a/client/animationsandfunctions.lua +++ b/client/animationsandfunctions.lua @@ -462,7 +462,7 @@ else AddSingleModel(methcar,{ name = 'methcar', icon = 'fa-solid fa-car', - label = 'Steal From Car', + label = Lang.targets.meth.stealfromcar, action = function() if not minigame() then return end TriggerServerEvent('md-drugs:server:givemethingridients') diff --git a/client/functions.lua b/client/functions.lua index a7c6da1..aff8e76 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -160,13 +160,11 @@ function minigame() until successes or time == 100 elseif minigametype == 'none' then return true - else - print"^1 SCRIPT ERROR: Md-Drugs set your minigame with one of the options!" + else + print"^1 SCRIPT ERROR: Md-Drugs set your minigame with one of the options!" end end - - function Notify(text, type) if notifytype =='ox' then lib.notify({title = text, type = type}) @@ -174,9 +172,9 @@ function minigame() QBCore.Functions.Notify(text, type) elseif notifytype == 'okok' then exports['okokNotify']:Alert('', text, 4000, type, false) - else + else print"^1 SCRIPT ERROR: Md-DRUGS set your notification with one of the options!" - end + end end function GetImage(img) @@ -256,7 +254,6 @@ end function ItemCheck(item) -local success if GetResourceState('ox_inventory') == 'started' then if exports.ox_inventory:GetItemCount(item) >= 1 then return true else Notify('You Need ' .. GetLabel(item) .. " !", 'error') return false end else @@ -292,7 +289,6 @@ function Email(sender, subject, message) sender = sender, senderDisplayName = sender, content = message, - }, 'phoneNumber', receiver) elseif Config.Phone == 'qs' then TriggerServerEvent('qs-smartphone:server:sendNewMail', { @@ -308,7 +304,7 @@ function Email(sender, subject, message) message = message, }) end -end +end function PoliceCall(chance) local math = math.random(1,100) @@ -379,7 +375,7 @@ function AddBoxZoneSingle(name, loc, data) data = data.data, canInteract = data.canInteract, } - }, + }, distance = 2.0 }) elseif Config.Target == 'ox' then diff --git a/client/meth.lua b/client/meth.lua index ceccded..f0c34d8 100644 --- a/client/meth.lua +++ b/client/meth.lua @@ -82,7 +82,7 @@ CreateThread(function() end) CreateThread(function() - AddBoxZoneSingle("methTeleOut",Config.MethTeleIn, {name = 'teleout', icon = "fa-solid fa-door-open", label = Lang.targets.meth.enter, action = function() SetEntityCoords(PlayerPedId(), Config.MethTeleOut) end} ) + AddBoxZoneSingle("methTeleOut",Config.MethTeleIn, {name = 'teleout', icon = "fa-solid fa-door-open", label = Lang.targets.meth.enter, action = function() SetEntityCoords(PlayerPedId(), Config.MethTeleOut) end} ) AddBoxZoneSingle("methtelein",Config.MethTeleOut, {name = 'teleout', icon = "fa-solid fa-door-closed", label = Lang.targets.meth.exit, action = function() SetEntityCoords(PlayerPedId(), Config.MethTeleIn) end} ) local options = { { name = 'methcook', icon = "fa-solid fa-temperature-high", label = Lang.targets.meth.cook, distance = 2.5, action = function() startcook() end, diff --git a/client/travellingmerchant.lua b/client/travellingmerchant.lua index 9a48bb3..fd35cb4 100644 --- a/client/travellingmerchant.lua +++ b/client/travellingmerchant.lua @@ -7,7 +7,7 @@ local current = "g_m_y_famdnf_01" local CurrentLocation = Config.Travellingmerchant[num] local travellingmerchant = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false) Freeze(travellingmerchant, true, CurrentLocation.w) - AddSingleModel(travellingmerchant, { label = "Travelling Merchant", icon = "fas fa-eye", + AddSingleModel(travellingmerchant, { label = Lang.targets.travel.travel, icon = "fas fa-eye", action = function() makeMenu('travellingMerchant') lib.showContext('travellingMerchant') diff --git a/server/functions.lua b/server/functions.lua index 69ae2a6..3a80c96 100644 --- a/server/functions.lua +++ b/server/functions.lua @@ -286,7 +286,7 @@ function AddRep(source, type, amount) return true end -RegisterCommand('fixmybrokenshit', function() +RegisterCommand('addCornerSellingTOREP', function() local sql = MySQL.query.await('SELECT * FROM drugrep', {}) for k, v in pairs (sql) do local new = {} @@ -304,8 +304,6 @@ RegisterCommand('fixmybrokenshit', function() level = 1 } }) - if new[1].coke == 125 then print('work') end - if not new[1].cornerselling == 125 then print('fail') return end local news = json.encode(new) MySQL.query.await('UPDATE drugrep SET drugrep = ? WHERE cid = ?', {news, v.cid}) end @@ -335,7 +333,7 @@ function ChecknRemove(source, table) if items.count >= v then hass = hass + 1 else - Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do This', 'error') + Notifys(source, 'You Need ' .. v .. ' Of ' .. GetLabels(k) .. ' To Do This', 'error') end end end diff --git a/server/lean.lua b/server/lean.lua index 8ef87ed..ff05933 100644 --- a/server/lean.lua +++ b/server/lean.lua @@ -1,30 +1,27 @@ local QBCore = exports['qb-core']:GetCoreObject() RegisterServerEvent('md-drugs:server:givelean', function() - local src = source local chance = math.random(1,100) local amount = math.random(1,5) if chance <= 50 then - if AddItem(src, 'mdlean', amount) then + if AddItem(source, 'mdlean', amount) then Notifys(Lang.Lean.lean, "success") - Log(GetName(src) .. ' Got ' .. amount .. ' Of Lean' , 'lean') + Log(GetName(source) .. ' Got ' .. amount .. ' Of Lean' , 'lean') end else - if AddItem(src, 'mdreddextro', amount) then + if AddItem(source, 'mdreddextro', amount) then Notifys(Lang.Lean.dextro, "success") - Log(GetName(src) .. ' Got ' .. amount .. ' Of Red Dextro' , 'lean') + Log(GetName(source) .. ' Got ' .. amount .. ' Of Red Dextro' , 'lean') end end end) QBCore.Functions.CreateUseableItem('leancup', function(source, item) - local src = source - if Itemcheck(src, 'leancup', 1) then - TriggerClientEvent('md-drugs:client:leancraft', src) + if Itemcheck(source, 'leancup', 1) then + TriggerClientEvent('md-drugs:client:leancraft', source) end end) RegisterServerEvent('md-drugs:server:finishcup', function(data) - local src = source if not GetRecipe(source, 'lean','cups', data.item) then return end end) \ No newline at end of file diff --git a/server/wholesale.lua b/server/wholesale.lua index 644eb13..58fdf46 100644 --- a/server/wholesale.lua +++ b/server/wholesale.lua @@ -10,12 +10,11 @@ QBCore.Functions.CreateUseableItem("cokeburner", function(source, item) local Player = getPlayer(source) TriggerClientEvent("md-drugs:client:GetLocation", src, 'coke', "Bring Me All The Coke You Have") end) - + RegisterServerEvent('md-drugs:server:wholesalecoke', function() local src = source local Player = getPlayer(src) local price = math.random(Config.Wcoke.min, Config.Wcoke.max) - for k, v in pairs(coke) do local item = Player.Functions.GetItemByName(v) @@ -28,11 +27,9 @@ RegisterServerEvent('md-drugs:server:wholesalecoke', function() end end) - QBCore.Functions.CreateUseableItem("crackburner", function(source, item) local src = source local Player = getPlayer(source) - TriggerClientEvent("md-drugs:client:GetLocation", src, 'crack', "Bring Me All The Crack You Have") end) @@ -40,7 +37,6 @@ RegisterServerEvent('md-drugs:server:wholesalecrack', function() local src = source local Player = getPlayer(src) local price = math.random(Config.Wcrack.min, Config.Wcrack.max) - for k, v in pairs(crack) do local item = Player.Functions.GetItemByName(v) if item and item.amount > 0 then @@ -82,7 +78,6 @@ end) QBCore.Functions.CreateUseableItem("heroinburner", function(source, item) local src = source local Player = getPlayer(source) - TriggerClientEvent("md-drugs:client:GetLocation", src, 'heroin', "Bring Me All The Heroin You Have") end) @@ -90,7 +85,6 @@ RegisterServerEvent('md-drugs:server:wholesaleheroin', function() local src = source local Player = getPlayer(src) local price = math.random(Config.WHeroin.min, Config.WHeroin.max) - for k, v in pairs(heroin) do local item = Player.Functions.GetItemByName(v) @@ -106,7 +100,6 @@ end) QBCore.Functions.CreateUseableItem("xtcburner", function(source, item) local src = source local Player = getPlayer(source) - TriggerClientEvent("md-drugs:client:GetLocation", src, 'xtc', "Bring Me All The xtc You Have") end) @@ -114,7 +107,6 @@ RegisterServerEvent('md-drugs:server:wholesalextc', function() local src = source local Player = getPlayer(src) local price = math.random(Config.WXTC.min, Config.WXTC.max) - for k, v in pairs(xtc) do local item = Player.Functions.GetItemByName(v) @@ -136,28 +128,28 @@ RegisterServerEvent('md-drugs:server:RemoveBurner', function(item) if Player.Functions.RemoveItem('cokeburner', 1) then else DropPlayer(src, 'How Did You Trigger The Event Without The Item?') - end + end elseif item == 'crack' then if Player.Functions.RemoveItem('crackburner', 1) then else DropPlayer(src, 'How Did You Trigger The Event Without The Item?') - end + end elseif item == 'heroin' then if Player.Functions.RemoveItem('heroinburner', 1) then else DropPlayer(src, 'How Did You Trigger The Event Without The Item?') - end + end elseif item == 'lsd' then if Player.Functions.RemoveItem('lsdburner', 1) then else DropPlayer(src, 'How Did You Trigger The Event Without The Item?') - end + end elseif item == 'xtc' then if Player.Functions.RemoveItem('xtcburner', 1) then else DropPlayer(src, 'How Did You Trigger The Event Without The Item?') - end - end + end + end end) diff --git a/shared/english.lua b/shared/english.lua index 0286910..e576893 100644 --- a/shared/english.lua +++ b/shared/english.lua @@ -63,7 +63,8 @@ Lang.targets = { adjust = 'Adjust Temperature', eph = 'Steal Ephedrine', ace = 'Steal Acetone', - mission = 'Get Mission' + mission = 'Get Mission', + stealfromcar = 'Steal From Car', }, oxy = { pack = 'Get Oxy Package', @@ -76,6 +77,9 @@ Lang.targets = { shrooms = { pick = 'Pick Shrooms', }, + travel = { + travel = 'Open Travelling Merchant', + }, xtc = { iso = 'Steal Isosafrole', mdp = 'Steal MDP2P',