diff --git a/server/cocaine.lua b/server/cocaine.lua index d820702..8677c49 100644 --- a/server/cocaine.lua +++ b/server/cocaine.lua @@ -38,7 +38,7 @@ end RegisterNetEvent("coke:pickupCane") AddEventHandler("coke:pickupCane", function(loc) local src = source - --if CheckDist(src, Config.CocaPlant[loc].location) then return end + if CheckDist(src, cokeplants[loc].location) then return end if not cokeplants[loc].taken then cokeplants[loc].taken = true GlobalState.CocaPlant = cokeplants diff --git a/server/locations.lua b/server/locations.lua index e1114d5..03381c4 100644 --- a/server/locations.lua +++ b/server/locations.lua @@ -117,7 +117,7 @@ function checkLoc(source, event, num) local coord = GetEntityCoords(pos) local loc = '' if type(num) =='string' then - loc = Target[event][num] + loc = vector3(Target[event][num].x, Target[event][num].y, Target[event][num].z) else loc = Target[event][num].loc end diff --git a/server/lsd.lua b/server/lsd.lua index 6e97eba..3650e27 100644 --- a/server/lsd.lua +++ b/server/lsd.lua @@ -117,7 +117,7 @@ end) RegisterServerEvent('md-drugs:server:getlabkit', function() local src = source local Player = getPlayer(src) - if CheckDist(source, vector3(Config.buylsdlabkit.x, Config.buylsdlabkit.y, Config.buylsdlabkit.z)) then return end + if not checkLoc(src,'singleSpot', 'buylsdlabkit') then return end if Player.Functions.RemoveMoney('cash', Config.lsdlabkitcost) then AddItem(src,'lsdlabkit', 1) Log(GetName(src) ..' Bought A LSD Lab Kit!', 'lsd') diff --git a/shared/config.lua b/shared/config.lua index d2127f5..2f29ab3 100644 --- a/shared/config.lua +++ b/shared/config.lua @@ -6,6 +6,18 @@ Config.Fuel = "LegacyFuel" -- type the name of script you use i.e. ps-fuel, cdn- 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.minigametype = 'ox' -- look above for options or choose none if you dont want any minigames +Config.FancyCokeAnims = false -- 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 +Config.MethHeist = false +Config.SuccessfulChance = 90 --- this is the chance of a Success wholesale 1-100 +Config.AlertPoliceWholesale = 90 -- 1-100 of how often it will alert police +Config.WholesaleTimeout = 600 -- time in seconds to get to the location +Config.PoliceCount = 0 -- Amount of police required +Config.PoliceAlertOxy = 90 -- This is a % out of 100 to alert police ----------------------------------- TierSystem levels ** ONLY IN USE IF CONFIG.TIERSYTEM IS TRUE Config.Tier1 = 100 -- amount to hit for level 2 @@ -36,20 +48,8 @@ Config.Minigames = { glmath = {timeLimit = 300000}, } -Config.minigametype = 'ox' -- look above for options or choose none if you dont want any minigames -Config.FancyCokeAnims = false -- if you want multi location this needs to be false +--- TODO: Move these to server files Config.tabcost = 100 -- price per piece of tab paper event does 10 at a time Config.lsdlabkitcost = 10000 -- price of the lsd lab kit Config.heroinlabkitprice = 10000 -- price of the lsd lab kit -Config.Badtrip = 20 -- number means % chance to spawn a clone that chases and attacks while on mescaline -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.SuccessfulChance = 90 --- this is the chance of a Success wholesale 1-100 -Config.AlertPoliceWholesale = 90 -- 1-100 of how often it will alert police -Config.WholesaleTimeout = 600 -- time in seconds to get to the location -Config.PoliceCount = 0 -- Amount of police required -Config.PoliceAlertOxy = 90 -- This is a % out of 100 to alert police -Config.MethHeist = false \ No newline at end of file diff --git a/shared/qbdrugsrewrite.lua b/shared/qbdrugsrewrite.lua index 057c38d..09651a2 100644 --- a/shared/qbdrugsrewrite.lua +++ b/shared/qbdrugsrewrite.lua @@ -1,7 +1,6 @@ QBConfig = {} ----------- qb-drugs update built in here below ----------- Everything is now a target and not displaytext. Dealers are no longer just doors, they will spawn peds where you place your dealer. This is a literally qb-drugs with SLIGHT edits. mainly added peds for deliveries, made everything a target ------------- and changed the range a ped will walk up to you to be a bigger radius. QBConfig.MinimumDrugSalePolice = 0 QBConfig.MarkedBills = true -- if false on both options below then it auto converts selling to give cash