update
This commit is contained in:
1 parent
b1bcb7ce56
commit
11e3b5efe6
8 files changed
+17
-30
No files matched your search
@@ -462,7 +462,7 @@ else
|
|||||||
AddSingleModel(methcar,{
|
AddSingleModel(methcar,{
|
||||||
name = 'methcar',
|
name = 'methcar',
|
||||||
icon = 'fa-solid fa-car',
|
icon = 'fa-solid fa-car',
|
||||||
label = 'Steal From Car',
|
label = Lang.targets.meth.stealfromcar,
|
||||||
action = function()
|
action = function()
|
||||||
if not minigame() then return end
|
if not minigame() then return end
|
||||||
TriggerServerEvent('md-drugs:server:givemethingridients')
|
TriggerServerEvent('md-drugs:server:givemethingridients')
|
||||||
|
|||||||
@@ -161,12 +161,10 @@ function minigame()
|
|||||||
elseif minigametype == 'none' then
|
elseif minigametype == 'none' then
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
print"^1 SCRIPT ERROR: Md-Drugs set your minigame with one of the options!"
|
print"^1 SCRIPT ERROR: Md-Drugs set your minigame with one of the options!"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function Notify(text, type)
|
function Notify(text, type)
|
||||||
if notifytype =='ox' then
|
if notifytype =='ox' then
|
||||||
lib.notify({title = text, type = type})
|
lib.notify({title = text, type = type})
|
||||||
@@ -256,7 +254,6 @@ end
|
|||||||
|
|
||||||
|
|
||||||
function ItemCheck(item)
|
function ItemCheck(item)
|
||||||
local success
|
|
||||||
if GetResourceState('ox_inventory') == 'started' then
|
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
|
if exports.ox_inventory:GetItemCount(item) >= 1 then return true else Notify('You Need ' .. GetLabel(item) .. " !", 'error') return false end
|
||||||
else
|
else
|
||||||
@@ -292,7 +289,6 @@ function Email(sender, subject, message)
|
|||||||
sender = sender,
|
sender = sender,
|
||||||
senderDisplayName = sender,
|
senderDisplayName = sender,
|
||||||
content = message,
|
content = message,
|
||||||
|
|
||||||
}, 'phoneNumber', receiver)
|
}, 'phoneNumber', receiver)
|
||||||
elseif Config.Phone == 'qs' then
|
elseif Config.Phone == 'qs' then
|
||||||
TriggerServerEvent('qs-smartphone:server:sendNewMail', {
|
TriggerServerEvent('qs-smartphone:server:sendNewMail', {
|
||||||
|
|||||||
+1
-1
@@ -82,7 +82,7 @@ CreateThread(function()
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
CreateThread(function()
|
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} )
|
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 = {
|
local options = {
|
||||||
{ name = 'methcook', icon = "fa-solid fa-temperature-high", label = Lang.targets.meth.cook, distance = 2.5, action = function() startcook() end,
|
{ name = 'methcook', icon = "fa-solid fa-temperature-high", label = Lang.targets.meth.cook, distance = 2.5, action = function() startcook() end,
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ local current = "g_m_y_famdnf_01"
|
|||||||
local CurrentLocation = Config.Travellingmerchant[num]
|
local CurrentLocation = Config.Travellingmerchant[num]
|
||||||
local travellingmerchant = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false)
|
local travellingmerchant = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false)
|
||||||
Freeze(travellingmerchant, true, CurrentLocation.w)
|
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()
|
action = function()
|
||||||
makeMenu('travellingMerchant')
|
makeMenu('travellingMerchant')
|
||||||
lib.showContext('travellingMerchant')
|
lib.showContext('travellingMerchant')
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ function AddRep(source, type, amount)
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
RegisterCommand('fixmybrokenshit', function()
|
RegisterCommand('addCornerSellingTOREP', function()
|
||||||
local sql = MySQL.query.await('SELECT * FROM drugrep', {})
|
local sql = MySQL.query.await('SELECT * FROM drugrep', {})
|
||||||
for k, v in pairs (sql) do
|
for k, v in pairs (sql) do
|
||||||
local new = {}
|
local new = {}
|
||||||
@@ -304,8 +304,6 @@ RegisterCommand('fixmybrokenshit', function()
|
|||||||
level = 1
|
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)
|
local news = json.encode(new)
|
||||||
MySQL.query.await('UPDATE drugrep SET drugrep = ? WHERE cid = ?', {news, v.cid})
|
MySQL.query.await('UPDATE drugrep SET drugrep = ? WHERE cid = ?', {news, v.cid})
|
||||||
end
|
end
|
||||||
@@ -335,7 +333,7 @@ function ChecknRemove(source, table)
|
|||||||
if items.count >= v then
|
if items.count >= v then
|
||||||
hass = hass + 1
|
hass = hass + 1
|
||||||
else
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
+6
-9
@@ -1,30 +1,27 @@
|
|||||||
local QBCore = exports['qb-core']:GetCoreObject()
|
local QBCore = exports['qb-core']:GetCoreObject()
|
||||||
|
|
||||||
RegisterServerEvent('md-drugs:server:givelean', function()
|
RegisterServerEvent('md-drugs:server:givelean', function()
|
||||||
local src = source
|
|
||||||
local chance = math.random(1,100)
|
local chance = math.random(1,100)
|
||||||
local amount = math.random(1,5)
|
local amount = math.random(1,5)
|
||||||
if chance <= 50 then
|
if chance <= 50 then
|
||||||
if AddItem(src, 'mdlean', amount) then
|
if AddItem(source, 'mdlean', amount) then
|
||||||
Notifys(Lang.Lean.lean, "success")
|
Notifys(Lang.Lean.lean, "success")
|
||||||
Log(GetName(src) .. ' Got ' .. amount .. ' Of Lean' , 'lean')
|
Log(GetName(source) .. ' Got ' .. amount .. ' Of Lean' , 'lean')
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if AddItem(src, 'mdreddextro', amount) then
|
if AddItem(source, 'mdreddextro', amount) then
|
||||||
Notifys(Lang.Lean.dextro, "success")
|
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
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
QBCore.Functions.CreateUseableItem('leancup', function(source, item)
|
QBCore.Functions.CreateUseableItem('leancup', function(source, item)
|
||||||
local src = source
|
if Itemcheck(source, 'leancup', 1) then
|
||||||
if Itemcheck(src, 'leancup', 1) then
|
TriggerClientEvent('md-drugs:client:leancraft', source)
|
||||||
TriggerClientEvent('md-drugs:client:leancraft', src)
|
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
RegisterServerEvent('md-drugs:server:finishcup', function(data)
|
RegisterServerEvent('md-drugs:server:finishcup', function(data)
|
||||||
local src = source
|
|
||||||
if not GetRecipe(source, 'lean','cups', data.item) then return end
|
if not GetRecipe(source, 'lean','cups', data.item) then return end
|
||||||
end)
|
end)
|
||||||
@@ -15,7 +15,6 @@ RegisterServerEvent('md-drugs:server:wholesalecoke', function()
|
|||||||
local src = source
|
local src = source
|
||||||
local Player = getPlayer(src)
|
local Player = getPlayer(src)
|
||||||
local price = math.random(Config.Wcoke.min, Config.Wcoke.max)
|
local price = math.random(Config.Wcoke.min, Config.Wcoke.max)
|
||||||
|
|
||||||
for k, v in pairs(coke) do
|
for k, v in pairs(coke) do
|
||||||
local item = Player.Functions.GetItemByName(v)
|
local item = Player.Functions.GetItemByName(v)
|
||||||
|
|
||||||
@@ -28,11 +27,9 @@ RegisterServerEvent('md-drugs:server:wholesalecoke', function()
|
|||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
||||||
QBCore.Functions.CreateUseableItem("crackburner", function(source, item)
|
QBCore.Functions.CreateUseableItem("crackburner", function(source, item)
|
||||||
local src = source
|
local src = source
|
||||||
local Player = getPlayer(source)
|
local Player = getPlayer(source)
|
||||||
|
|
||||||
TriggerClientEvent("md-drugs:client:GetLocation", src, 'crack', "Bring Me All The Crack You Have")
|
TriggerClientEvent("md-drugs:client:GetLocation", src, 'crack', "Bring Me All The Crack You Have")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -40,7 +37,6 @@ RegisterServerEvent('md-drugs:server:wholesalecrack', function()
|
|||||||
local src = source
|
local src = source
|
||||||
local Player = getPlayer(src)
|
local Player = getPlayer(src)
|
||||||
local price = math.random(Config.Wcrack.min, Config.Wcrack.max)
|
local price = math.random(Config.Wcrack.min, Config.Wcrack.max)
|
||||||
|
|
||||||
for k, v in pairs(crack) do
|
for k, v in pairs(crack) do
|
||||||
local item = Player.Functions.GetItemByName(v)
|
local item = Player.Functions.GetItemByName(v)
|
||||||
if item and item.amount > 0 then
|
if item and item.amount > 0 then
|
||||||
@@ -82,7 +78,6 @@ end)
|
|||||||
QBCore.Functions.CreateUseableItem("heroinburner", function(source, item)
|
QBCore.Functions.CreateUseableItem("heroinburner", function(source, item)
|
||||||
local src = source
|
local src = source
|
||||||
local Player = getPlayer(source)
|
local Player = getPlayer(source)
|
||||||
|
|
||||||
TriggerClientEvent("md-drugs:client:GetLocation", src, 'heroin', "Bring Me All The Heroin You Have")
|
TriggerClientEvent("md-drugs:client:GetLocation", src, 'heroin', "Bring Me All The Heroin You Have")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -90,7 +85,6 @@ RegisterServerEvent('md-drugs:server:wholesaleheroin', function()
|
|||||||
local src = source
|
local src = source
|
||||||
local Player = getPlayer(src)
|
local Player = getPlayer(src)
|
||||||
local price = math.random(Config.WHeroin.min, Config.WHeroin.max)
|
local price = math.random(Config.WHeroin.min, Config.WHeroin.max)
|
||||||
|
|
||||||
for k, v in pairs(heroin) do
|
for k, v in pairs(heroin) do
|
||||||
local item = Player.Functions.GetItemByName(v)
|
local item = Player.Functions.GetItemByName(v)
|
||||||
|
|
||||||
@@ -106,7 +100,6 @@ end)
|
|||||||
QBCore.Functions.CreateUseableItem("xtcburner", function(source, item)
|
QBCore.Functions.CreateUseableItem("xtcburner", function(source, item)
|
||||||
local src = source
|
local src = source
|
||||||
local Player = getPlayer(source)
|
local Player = getPlayer(source)
|
||||||
|
|
||||||
TriggerClientEvent("md-drugs:client:GetLocation", src, 'xtc', "Bring Me All The xtc You Have")
|
TriggerClientEvent("md-drugs:client:GetLocation", src, 'xtc', "Bring Me All The xtc You Have")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -114,7 +107,6 @@ RegisterServerEvent('md-drugs:server:wholesalextc', function()
|
|||||||
local src = source
|
local src = source
|
||||||
local Player = getPlayer(src)
|
local Player = getPlayer(src)
|
||||||
local price = math.random(Config.WXTC.min, Config.WXTC.max)
|
local price = math.random(Config.WXTC.min, Config.WXTC.max)
|
||||||
|
|
||||||
for k, v in pairs(xtc) do
|
for k, v in pairs(xtc) do
|
||||||
local item = Player.Functions.GetItemByName(v)
|
local item = Player.Functions.GetItemByName(v)
|
||||||
|
|
||||||
|
|||||||
+5
-1
@@ -63,7 +63,8 @@ Lang.targets = {
|
|||||||
adjust = 'Adjust Temperature',
|
adjust = 'Adjust Temperature',
|
||||||
eph = 'Steal Ephedrine',
|
eph = 'Steal Ephedrine',
|
||||||
ace = 'Steal Acetone',
|
ace = 'Steal Acetone',
|
||||||
mission = 'Get Mission'
|
mission = 'Get Mission',
|
||||||
|
stealfromcar = 'Steal From Car',
|
||||||
},
|
},
|
||||||
oxy = {
|
oxy = {
|
||||||
pack = 'Get Oxy Package',
|
pack = 'Get Oxy Package',
|
||||||
@@ -76,6 +77,9 @@ Lang.targets = {
|
|||||||
shrooms = {
|
shrooms = {
|
||||||
pick = 'Pick Shrooms',
|
pick = 'Pick Shrooms',
|
||||||
},
|
},
|
||||||
|
travel = {
|
||||||
|
travel = 'Open Travelling Merchant',
|
||||||
|
},
|
||||||
xtc = {
|
xtc = {
|
||||||
iso = 'Steal Isosafrole',
|
iso = 'Steal Isosafrole',
|
||||||
mdp = 'Steal MDP2P',
|
mdp = 'Steal MDP2P',
|
||||||
|
|||||||
Reference in new issue
Block a user