diff --git a/client/animationsandfunctions.lua b/client/animationsandfunctions.lua index 971b8ec..ef51f70 100644 --- a/client/animationsandfunctions.lua +++ b/client/animationsandfunctions.lua @@ -394,7 +394,7 @@ function SpawnCarPedChase() until #(GetEntityCoords(driver) - stoploc) < 20.0 or GetEntityHealth(driver) == 0 RemoveBlip(leancar) if GetEntityHealth(driver) == 0 then - AddSingleModel(leancar, { name = 'leancar', icon = 'fa-solid fa-car', label = 'Steal From Car', + AddSingleModel(leancar, { name = 'leancar', icon = 'fa-solid fa-car', label = Lang.targets.lean.st, action = function() hit = hit + 1 if not minigame() then return end diff --git a/client/functions.lua b/client/functions.lua index 9c2f25f..16fece9 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -374,7 +374,7 @@ function AddBoxZoneSingle(name, loc, data) type = data.type or nil, event = data.event or nil, action = data.action or nil, - icon = data.icon, + icon = data.icon or "fa-solid fa-eye", label = data.label, data = data.data, canInteract = data.canInteract, @@ -389,7 +389,7 @@ function AddBoxZoneSingle(name, loc, data) event = data.event or nil, onSelect = data.action or nil, distance = 2.5, - icon = data.icon, + icon = data.icon or "fa-solid fa-eye", label = data.label, data = data.data, canInteract = data.canInteract, @@ -426,7 +426,7 @@ function AddBoxZoneMulti(name, table, data) type = data.type or nil, event = data.event or nil, action = data.action or nil, - icon = data.icon, + icon = data.icon or "fa-solid fa-eye", label = data.label, data = k, canInteract = data.canInteract or function() @@ -441,7 +441,7 @@ function AddBoxZoneMulti(name, table, data) type = data.type or nil, event = data.event or nil, onSelect = data.action or nil, - icon = data.icon, + icon = data.icon or "fa-solid fa-eye", label = data.label, data = k, distance = 2.5, @@ -461,7 +461,7 @@ function AddBoxZoneMulti(name, table, data) event = data.event or nil, action = data.action or nil, distance = 2.5, - label = data.label, + label = data.label or "fa-solid fa-eye", data = k, canInteract = data.canInteract or function() if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end @@ -475,8 +475,9 @@ end function AddBoxZoneMultiOptions(name, loc, data) local options = {} for k, v in pairs (data) do + table.insert(options, { - icon = v.icon, label = v.label, event = v.event or nil, action = v.action or nil, + 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, }) end @@ -494,7 +495,7 @@ end function AddSingleModel(model, data, num) if Config.Target == 'qb' then exports['qb-target']:AddTargetEntity(model, {options = { - {icon = data.icon, label = data.label, event = data.event or nil, action = data.action or nil, data = num } + {icon = data.icon or "fa-solid fa-eye", label = data.label, event = data.event or nil, action = data.action or nil, data = num } }, distance = 2.5}) elseif Config.Target == 'ox' then exports.ox_target:addLocalEntity(model, {icon = data.icon, label = data.label, event = data.event or nil, onSelect = data.action or nil, data = num, distance = 2.5 }) @@ -507,7 +508,7 @@ function AddMultiModel(model, data, num) local options = {} for k, v in pairs (data) do table.insert(options, { - icon = v.icon, label = v.label, event = v.event or nil, action = v.action or nil, + 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, }) end diff --git a/client/meth.lua b/client/meth.lua index a250fa0..0eb7723 100644 --- a/client/meth.lua +++ b/client/meth.lua @@ -101,18 +101,18 @@ CreateThread(function() }, } AddBoxZoneMultiOptions("cookmeth",vector3(1005.72, -3200.33, -38.52), options ) - AddBoxZoneSingle('boxmeth', vector3(1012.15, -3194.04, -39.20), {name = 'boxmeth',icon = "fas fa-sign-in-alt",label = Lang.targets.meth.box,action = function() smash()end, + AddBoxZoneSingle('boxmeth', vector3(1012.15, -3194.04, -39.20), {name = 'boxmeth',icon = "fa-solid fa-weight-scale",label = Lang.targets.meth.box,action = function() smash()end, canInteract = function() if tray then return true end end}) - AddBoxZoneSingle('adjustdials',vector3(1007.89, -3201.17, -38.99),{ name = 'adjustdials', icon = "fas fa-sign-in-alt", label = Lang.targets.meth.adjust, + AddBoxZoneSingle('adjustdials',vector3(1007.89, -3201.17, -38.99),{ name = 'adjustdials', icon = "fa-solid fa-temperature-three-quarters", label = Lang.targets.meth.adjust, distance = 5, action = function() dials() end, canInteract = function() if amonia and heated == nil then return true end end }) if Config.MethHeist == false then - AddBoxZoneMulti('methep', config.MethEph, {icon = "fas fa-sign-in-alt", label = Lang.targets.meth.eph, event = 'md-drugs:client:stealeph'}) - AddBoxZoneMulti('methace', config.Methace, {icon = "fas fa-sign-in-alt", label = Lang.targets.meth.ace, event = 'md-drugs:client:stealace'}) + AddBoxZoneMulti('methep', config.MethEph, {icon = "fa-solid fa-bucket", label = Lang.targets.meth.eph, event = 'md-drugs:client:stealeph'}) + AddBoxZoneMulti('methace', config.Methace, {icon = "fa-solid fa-bucket", label = Lang.targets.meth.ace, event = 'md-drugs:client:stealace'}) end end) diff --git a/client/oxyruns.lua b/client/oxyruns.lua index 0e93c63..d256f5c 100644 --- a/client/oxyruns.lua +++ b/client/oxyruns.lua @@ -12,7 +12,7 @@ RegisterNetEvent("md-drugs:client:GetOxyCar", function() TriggerEvent("vehiclekeys:client:SetOwner", QBCore.Functions.GetPlate(oxycar)) Notify(Lang.oxy.truck, 'success') TriggerEvent("md-drugs:client:getoxylocationroute") - AddSingleModel(oxycar, { event = "md-drugs:client:getfromtrunk", icon = "fas fa-box-circle-check", label = Lang.targets.oxy.pack}, nil ) + AddSingleModel(oxycar, { event = "md-drugs:client:getfromtrunk", icon = "fa-solid fa-box", label = Lang.targets.oxy.pack}, nil ) end) RegisterNetEvent("md-drugs:client:getoxylocationroute", function() @@ -28,7 +28,7 @@ RegisterNetEvent("md-drugs:client:getoxylocationroute", function() Wait(1000) until #(GetEntityCoords(PlayerPedId()) - vector3(loc.x,loc.y,loc.z)) < 5.0 PoliceCall(Config.PoliceAlertOxy) - AddSingleModel(oxybuyer, { type = "client", label = Lang.targets.oxy.talk, icon = "fas fa-eye", + AddSingleModel(oxybuyer, { type = "client", label = Lang.targets.oxy.talk, icon = "fa-solid fa-dollar-sign", action = function() if carryPackage then if not progressbar(Lang.oxy.hand, 4000, 'uncuff') then return end diff --git a/client/pedspawns.lua b/client/pedspawns.lua index a8f781c..2f22ce5 100644 --- a/client/pedspawns.lua +++ b/client/pedspawns.lua @@ -21,7 +21,7 @@ CreateThread(function() AddSingleModel(tabdealer,{ type = "client", label = Lang.targets.lsd.buy, icon = "fa-solid fa-money-bill", event = "md-drugs:client:buylabkit", distance = 2.0}, tabdealer ) AddSingleModel(heroinkitdealer, { label = Lang.targets.heroin.kit, icon = "fa-solid fa-money-bill", event = "md-drugs:client:buyheroinlabkit", distance = 2.0}, nil ) AddSingleModel(SyrupLocation, { type = "client", label = Lang.targets.lean.git, icon = "fa-solid fa-circle-info", event = "md-drugs:client:getsyruplocationtobuy", distance = 2.0}, nil ) - AddSingleModel(WeedGuy, {label = "Weed Shop",icon = "fas fa-eye", action = function() makeMenu('WeedShop') lib.showContext('WeedShop')end}, nil) - AddSingleModel(methdealer,{label = Lang.targets.meth.mission, icon = "fas fa-eye", action = function() Notify(Lang.meth.mission, "success") SpawnMethCarPedChase() end,},nil ) - AddSingleModel(travellingmerchant, {label = Lang.targets.travel.travel, icon = "fas fa-eye", action = function() makeMenu('travellingMerchant') lib.showContext('travellingMerchant') end}, nil) + AddSingleModel(WeedGuy, {label = "Weed Shop",icon = "fa-solid fa-cannabis", action = function() makeMenu('WeedShop') lib.showContext('WeedShop')end}, nil) + AddSingleModel(methdealer,{label = Lang.targets.meth.mission, icon = "fa-solid fa-circle-info", action = function() Notify(Lang.meth.mission, "success") SpawnMethCarPedChase() end,},nil ) + AddSingleModel(travellingmerchant, {label = Lang.targets.travel.travel, icon = "fa-solid fa-cart-shopping", action = function() makeMenu('travellingMerchant') lib.showContext('travellingMerchant') end}, nil) end) \ No newline at end of file diff --git a/client/target.lua b/client/target.lua index e185b0f..25e6ef1 100644 --- a/client/target.lua +++ b/client/target.lua @@ -7,20 +7,20 @@ CreateThread(function() 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 - AddBoxZoneMulti('steallysergic', config.lysergicacid, {event = "md-drugs:client:getlysergic", icon = icon, label = Lang.targets.lsd.lys}) -- lsd - AddBoxZoneMulti('stealdiethylamide', config.diethylamide, {event = "md-drugs:client:getdiethylamide", icon = icon, label = Lang.targets.lsd.die}) -- lsd - AddBoxZoneMulti('gettabs', config.gettabs, {event = "md-drugs:client:buytabs", icon = icon, label = Lang.targets.lsd.buyt}) -- lsd - AddBoxZoneMulti('dryheroin', config.dryplant, {event = "md-drugs:client:dryplant", icon = icon, label = Lang.targets.heroin.dry}) -- heroin - AddBoxZoneMulti('cutheroin', config.cutheroinone, {event = "md-drugs:client:cutheroin", icon = icon, label = Lang.targets.heroin.cut}) -- heroin - AddBoxZoneMulti('fillneedle', config.fillneedle, {event = "md-drugs:client:fillneedle", icon = icon, label = Lang.targets.heroin.fill}) -- heroin - AddBoxZoneMulti('makecrack', config.makecrack, {event = "md-drugs:client:makecrackone", icon = icon, label = Lang.targets.crack.cook}) -- crack - AddBoxZoneMulti('bagcrack', config.bagcrack, {event = "md-drugs:client:bagcrack", icon = icon, label = Lang.targets.crack.bag}) -- crack - AddBoxZoneMulti('fillprescription', config.FillPrescription, {event = "md-drugs:client:fillprescription", icon = icon, label = Lang.targets.pha.fill}) -- pharma - AddBoxZoneSingle('payfortruck', config.singleSpot.Payfortruck, {event = "md-drugs:client:GetOxyCar", icon = icon, label = Lang.targets.oxy.pay}) -- oxy runs - AddBoxZoneSingle('drymescaline', config.singleSpot.DryOut, {event = "md-drugs:client:drymescaline", icon = icon, label = Lang.targets.mescaline.dry}) -- mescaline - AddBoxZoneMulti('stealisosafrole', config.isosafrole, {event = "md-drugs:client:stealisosafrole", icon = icon, label = Lang.targets.xtc.iso}) -- xtc - AddBoxZoneMulti('stealmdp2p', config.mdp2p, {event = "md-drugs:client:stealmdp2p", icon = icon, label = Lang.targets.xtc.mdp}) -- xtc - AddBoxZoneMulti('rawxtcloc', config.rawxtcloc, {event = "md-drugs:client:makingrawxtc", icon = icon, label = Lang.targets.xtc.raw}) -- xtc - AddBoxZoneSingle('buypress', config.singleSpot.buypress, {event = "md-drugs:client:buypress", icon = icon, label = Lang.targets.xtc.press}) -- xtc - AddBoxZoneMulti('stamp', config.stamp, {event = "md-drugs:client:stampwhite", icon = icon, label = Lang.targets.xtc.stamp}) -- xtc + AddBoxZoneMulti('steallysergic', config.lysergicacid, {event = "md-drugs:client:getlysergic", icon = "fa-solid fa-prescription-bottle", label = Lang.targets.lsd.lys}) -- lsd + AddBoxZoneMulti('stealdiethylamide', config.diethylamide, {event = "md-drugs:client:getdiethylamide", icon = "fa-solid fa-prescription-bottle", label = Lang.targets.lsd.die}) -- lsd + AddBoxZoneMulti('gettabs', config.gettabs, {event = "md-drugs:client:buytabs", icon = "fa-solid fa-eye-dropper", label = Lang.targets.lsd.buyt}) -- lsd + AddBoxZoneMulti('dryheroin', config.dryplant, {event = "md-drugs:client:dryplant", icon = "fa-solid fa-temperature-full", label = Lang.targets.heroin.dry}) -- heroin + AddBoxZoneMulti('cutheroin', config.cutheroinone, {event = "md-drugs:client:cutheroin", icon = "fa-solid fa-flask", label = Lang.targets.heroin.cut}) -- heroin + AddBoxZoneMulti('fillneedle', config.fillneedle, {event = "md-drugs:client:fillneedle", icon = "fa-solid fa-syringe", label = Lang.targets.heroin.fill}) -- heroin + AddBoxZoneMulti('makecrack', config.makecrack, {event = "md-drugs:client:makecrackone", icon = "fa-solid fa-temperature-high", label = Lang.targets.crack.cook}) -- crack + AddBoxZoneMulti('bagcrack', config.bagcrack, {event = "md-drugs:client:bagcrack", icon = "fa-solid fa-weight-scale", label = Lang.targets.crack.bag}) -- crack + AddBoxZoneMulti('fillprescription', config.FillPrescription, {event = "md-drugs:client:fillprescription", icon = "fa-solid fa-prescription", label = Lang.targets.pha.fill}) -- pharma + AddBoxZoneSingle('payfortruck', config.singleSpot.Payfortruck, {event = "md-drugs:client:GetOxyCar", icon = "fa-solid fa-truck-moving", label = Lang.targets.oxy.pay}) -- oxy runs + AddBoxZoneSingle('drymescaline', config.singleSpot.DryOut, {event = "md-drugs:client:drymescaline", icon = "fa-solid fa-temperature-full", label = Lang.targets.mescaline.dry}) -- mescaline + AddBoxZoneMulti('stealisosafrole', config.isosafrole, {event = "md-drugs:client:stealisosafrole", icon = "fa-solid fa-vial", label = Lang.targets.xtc.iso}) -- xtc + AddBoxZoneMulti('stealmdp2p', config.mdp2p, {event = "md-drugs:client:stealmdp2p", icon = "fa-solid fa-vial", label = Lang.targets.xtc.mdp}) -- xtc + AddBoxZoneMulti('rawxtcloc', config.rawxtcloc, {event = "md-drugs:client:makingrawxtc", icon = "fa-solid fa-tablets", label = Lang.targets.xtc.raw}) -- xtc + AddBoxZoneSingle('buypress', config.singleSpot.buypress, {event = "md-drugs:client:buypress", icon = "fa-solid fa-mortar-pestle", label = Lang.targets.xtc.press}) -- xtc + AddBoxZoneMulti('stamp', config.stamp, {event = "md-drugs:client:stampwhite", icon = "fa-solid fa-tablets", label = Lang.targets.xtc.stamp}) -- xtc end) diff --git a/client/weed.lua b/client/weed.lua index 28732a4..fb994ae 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -74,7 +74,7 @@ CreateThread(function() Wait(math.random(1000,5000)) Notify(Lang.Weed.take, "success") AddSingleModel(weedplant, { - icon = "fas fa-sign-in-alt", + icon = "fa-solid fa-cannabis", label = Lang.targets.weed.dpick, action = function() DeleteEntity(weedplant) @@ -90,19 +90,19 @@ CreateThread(function() if hasJob() then return true end end }) -AddBoxZoneSingle('teleinweedout', config.singleSpot.weedTeleout, { name = 'teleout', icon = "fas fa-sign-in-alt", label = Lang.targets.coke.exit, distance = 2.0, action = function() SetEntityCoords(PlayerPedId(),config.singleSpot.weedTelein) end, +AddBoxZoneSingle('teleinweedout', config.singleSpot.weedTeleout, { name = 'teleout', icon = "fa-solid fa-door-closed", label = Lang.targets.coke.exit, distance = 2.0, action = function() SetEntityCoords(PlayerPedId(),config.singleSpot.weedTelein) end, canInteract = function() if hasJob() then return true end end }) -AddBoxZoneSingle('teleinweedin', config.singleSpot.weedTelein, { name = 'teleout', icon = "fas fa-sign-in-alt", label = Lang.targets.coke.enter, distance = 2.0, action = function() SetEntityCoords(PlayerPedId(),config.singleSpot.weedTeleout) end, +AddBoxZoneSingle('teleinweedin', config.singleSpot.weedTelein, { name = 'teleout', icon = "fa-solid fa-door-open", label = Lang.targets.coke.enter, distance = 2.0, action = function() SetEntityCoords(PlayerPedId(),config.singleSpot.weedTeleout) end, canInteract = function() if hasJob() then return true end end }) -AddBoxZoneSingle('MakeButterCrafting', config.singleSpot.MakeButter, {label = Lang.targets.weed.butt, action = function() lib.showContext('ButterCraft') end, icon = "fas fa-sign-in-alt", +AddBoxZoneSingle('MakeButterCrafting', config.singleSpot.MakeButter, {label = Lang.targets.weed.butt, action = function() lib.showContext('ButterCraft') end, icon = "fa-solid fa-cookie", canInteract = function() if hasJob() then return true end end }) AddBoxZoneSingle('makeoil',config.singleSpot.MakeOil, { name = 'Oil', - icon = "fas fa-sign-in-alt", + icon = "fa-solid fa-oil-can", label = Lang.targets.weed.oil, action = function() if not ItemCheckMulti({'butane', 'grindedweed'}) then return end diff --git a/client/xtc.lua b/client/xtc.lua index bb13a2f..6ad6c56 100644 --- a/client/xtc.lua +++ b/client/xtc.lua @@ -35,7 +35,7 @@ else PlaceObjectOnGroundProperly(press) Freeze(press, true, head) local options = { - { icon = "fas fa-eye", label = Lang.targets.xtc.make, distance = 2.0, action = function() TriggerEvent("md-drugs:client:XTCMenu", type) end, + { 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 }, {icon = "fas fa-eye", label = Lang.targets.xtc.pick, action = function() TriggerEvent("md-drugs:client:GetPressBack", type, press) end, distance = 2.0, diff --git a/fxmanifest.lua b/fxmanifest.lua index 888b143..8fe7519 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -3,7 +3,7 @@ author "mustache_dom" description "drugs by mustache dom" fx_version "cerulean" game "gta5" -version '3.8.0' +version '3.9.0' client_scripts { 'client/**.lua', } @@ -11,20 +11,15 @@ client_scripts { server_scripts { 'server/**.lua', '@oxmysql/lib/MySQL.lua', - } shared_scripts { '@ox_lib/init.lua', 'shared/**.lua', - } - lua54 'yes' - -dependency 'bob74_ipl' files { 'stream/mushroom.ytyp', 'stream/mushroom.ydr' diff --git a/test.sql b/mddrugs.sql similarity index 97% rename from test.sql rename to mddrugs.sql index 4e801d6..abc220f 100644 --- a/test.sql +++ b/mddrugs.sql @@ -1,19 +1,19 @@ - -CREATE TABLE IF NOT EXISTS `deliveriesdealer` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `cid` varchar(50) NOT NULL, - `itemdata` varchar(50) NOT NULL, - `timestart` varchar(50) NOT NULL, - `timestop` varchar(50) DEFAULT NULL, - `maxtime` varchar(50) NOT NULL, - `location` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; - -CREATE TABLE IF NOT EXISTS `drugrep` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `cid` varchar(50) DEFAULT NULL, - `drugrep` varchar(255) DEFAULT NULL, - `name` varchar(50) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + +CREATE TABLE IF NOT EXISTS `deliveriesdealer` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `cid` varchar(50) NOT NULL, + `itemdata` varchar(50) NOT NULL, + `timestart` varchar(50) NOT NULL, + `timestop` varchar(50) DEFAULT NULL, + `maxtime` varchar(50) NOT NULL, + `location` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + +CREATE TABLE IF NOT EXISTS `drugrep` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `cid` varchar(50) DEFAULT NULL, + `drugrep` varchar(255) DEFAULT NULL, + `name` varchar(50) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; diff --git a/patchnotes.txt b/patchnotes.txt deleted file mode 100644 index 8b09baa..0000000 --- a/patchnotes.txt +++ /dev/null @@ -1,103 +0,0 @@ -Notes from 3.5.2 -> 3.5.3 - -added easier calls for GetCops - -added support for qs phone emails - -added option for minigames 'none' so its not required - - -3.5.3 - > 3.5.4 - -1) Removed Config.imagelink - too tired of people not changing that and then asking me why images wont load. - - should work for qb, ps, lj, ox, qs, core, origen. if you use another inventory go to line 147 of the functions.lua in the client folder - - make this adjustment - ``` - elseif GetResourceState('yourinventoryname') == 'started' then - return "nui:/yourinventoryname/folder1/folder2/".. QBCore.Shared.Items[img].image - ``` -2 )small bug fixes in meth.lua client side -3) small bug fixes in pharma.lua server side -4) bug allowing to see target for drying weed when waiting for the weed to dry patched - -3.5.4 - > 3.5.5 -Updated small tweaks to client and server functions.lua - - -3.5.5 - > 3.5.6 -updated mainly client/server functions.lua to include a check for if using scully emotes then use the export to cancel emote once done with progressbar, added support for a few other inventories and dispatch - -added new item box events for additem and removeitem functions in the server/functions.lua -I left the original itembox event in, if you dont use the old event it will just trigger to a blank event and the next event will trigger, its a duct tape backwards compat method - -3.5.6 - > 3.5.7 - -added a couple new functions to cut back on repeating natives needed ( Freeze() ) will now set an entitys heading, block temp events, freeze, and set invincible) -added better calls for GetImage and GetLabel for ox inventory -converted all callbacks to lib.callback to increase optimization -should be fully compatible with qbx without needing to make a couple edits now - -3.5.7 - > 3.5.8 -Added support for fivemerr logs -3.5.8 -> 3.5.9 -added command /cornersell **you only need to update server/cornserselling.lua** from previous update - -3.5.9 - > 3.7.0 - -im bad at numbers sue me kek - -a lot has been changed with this version -The main thing to update from 3.5.9 to 3.7.0 is a couple things in your config -SAVE YOUR SHARED FOLDER AND COPY AND PASTE IT TO YOUR DESKTOP SO YOU HAVE A SECOND COPY - -``` -Config.oxtarget: - no longer exists in new version. Change it to - -Config.Target = 'qb' -- qb or ox - -Config.minigametype: -changed a little bit. you need to add this table to make things work now - -Config.Minigames = { - ps = { amount = 2, speed = 8,}, - ox = { 'easy', 'easy'}, --easy medium or hard each one corresponds to how many skillchecks and the difficulty - blcirprog = { amount = 2, speed = 50}, -- speed = 1-100 - blprog = { amount = 1, speed = 50}, -- speed = 1-100 - blkeyspam = { amount = 1, difficulty = 50}, -- difficulty = 1-100 - blkeycircle = { amount = 1, difficulty = 50, keynumbers = 3}, - blnumberslide = { amount = 1, difficulty = 50, keynumbers = 3}, - blrapidlines = { amount = 1, difficulty = 50, numberofline = 3}, - blcircleshake = { amount = 1, difficulty = 50, stages = 3}, - glpath = { gridsize = 10, lives = 3, timelimit = 999999}, - glspot = {gridSize = 6, timeLimit = 999999, charSet = "alphabet", required = 10}, - glmath = {timeLimit = 300000}, - -} - -what does this do, adds 10 more minigames than before you can use. How to set it, change Config.minigametype to the key of that table like ps ox blcirprog - -``` - -Now thats the config changes so you dont need to reconfig everything as I do my best to not change much in the config and work around what has been done - -Whats been added -``` -i moved tier system to SQL as its better than using metadata -run the SQL and it will autopopulate your metadata for rep so people wont lose anything - -I added a new sql table for deliveries - -it not checks overall time for deliveries regardless if you crash or not. - -Added new server file called recipes.lua - -its what you imagine, about 80-90% of the recipes for md-drugs - -``` - -Is there bugs, probably. But im tired of beta testing it over and over so please report bugs to my discord where i can see them and patch them quickly. - - -3.7.0 -> 3.7.1 -slight bug fixes with ox items, meth targeting diff --git a/server/functions.lua b/server/functions.lua index ec2609b..ca1b95c 100644 --- a/server/functions.lua +++ b/server/functions.lua @@ -340,7 +340,9 @@ CreateThread(function() print('^1 ox_lib Is A Depndancy, Not An Optional ') end end) + CreateThread(function() + if not lib.checkDependency('md-drugs', '1.5.0') then print('You Suck') end local url = "https://raw.githubusercontent.com/Mustachedom/md-drugs/main/version.txt" local version = GetResourceMetadata('md-drugs', "version" ) PerformHttpRequest(url, function(err, text, headers) @@ -348,4 +350,4 @@ CreateThread(function() print('^2 Your Version:' .. version .. ' | Current Version:' .. text .. '' ) end end, "GET", "", "") -end) \ No newline at end of file +end) diff --git a/shared/config.lua b/shared/config.lua index 667cef0..ad587c6 100644 --- a/shared/config.lua +++ b/shared/config.lua @@ -1,14 +1,12 @@ Config = {} --Ignore. -Config.Target = 'ox' -- qb or ox Config.respawnTime = 150 -- Seconds Config.Fuel = "LegacyFuel" -- type the name of script you use i.e. ps-fuel, cdn-fuel, LegacyFuel Config.TierSystem = true -- allows for three tiers of certain drugs ( coke, heroin, crack, lsd) Config.StupidassNewQbItemName = true -- true if you have updated your items.lua from base qb after november 2023 because changing item names this far in a framework is 3 IQ points total Config.RequestModelTime = 30000 -- if you need more time than this, uhhhh wow - Config.FancyCokeAnims = true -- if you want multi location this needs to be false -Config.PharmaJob = "ems" -- what TYPE role you need to be on to get the command + Config.Joblock = false -- if you want weed to be a job Config.weedjob = "" -- what the job name is Config.Badtrip = 20 -- number means % chance to spawn a clone that chases and attacks while on mescaline @@ -28,7 +26,7 @@ Config.progressbartype = 'oxcir' -- either 'qb', 'oxcir', 'oxbar' Config.Notify = 'ox' -- -- either 'qb' or 'ox' or 'okok' Config.Phone = 'qb' -- either 'qb' or 'yflip' or 'qs' Config.Dispatch = 'ps' -- either 'ps', 'cd', 'core', 'aty' - +Config.Target = 'ox' -- qb or ox Config.Minigames = { ps_circle = {amount = 2, speed = 8,}, ps_maze = {timelimit = 15}, diff --git a/shared/english.lua b/shared/english.lua index e576893..fb6c6ed 100644 --- a/shared/english.lua +++ b/shared/english.lua @@ -35,7 +35,8 @@ Lang.targets = { vial = 'Make Vial', }, lean = { - git = 'Get Task' + git = 'Get Task', + st = 'Steal From Car' }, lsd = { buy = 'Buy LSD Lab Kit', @@ -289,4 +290,4 @@ Lang.xtc = { Lang.Wholesale = { al = 'Already Called Someone!' -} \ No newline at end of file +} diff --git a/version.txt b/version.txt index 6641052..ee9ddd3 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -3.8.0 +3.9.0