diff --git a/client/cocaine.lua b/client/cocaine.lua index d5b9d32..41dd9d8 100644 --- a/client/cocaine.lua +++ b/client/cocaine.lua @@ -130,6 +130,7 @@ for k, v in pairs (locations.MakePowder) do end } }) + targets[#targets+1] = 'cocaplant'..k end for k, v in pairs (locations.CuttingCoke) do diff --git a/client/whippit.lua b/client/whippit.lua index 544b8af..c58c0ed 100644 --- a/client/whippit.lua +++ b/client/whippit.lua @@ -1,5 +1,6 @@ local prop = nil repeat Wait(100) until GlobalState.MDDrugsLocations.Whippit ~= nil and GlobalState.MDDrugsRecipes.Whippit ~= nil + local function animation(color) local coords = GetEntityCoords(PlayerPedId()) Bridge.Anim.RequestDict('mp_player_intdrink') diff --git a/fxmanifest.lua b/fxmanifest.lua index ab0341b..16118e9 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -19,7 +19,7 @@ server_scripts { } shared_scripts { - '@ox_lib/init.lua', + '@ox_lib/init.lua', 'shared/**.lua', } diff --git a/server/functions.lua b/server/functions.lua index 4e3f63c..9857aef 100644 --- a/server/functions.lua +++ b/server/functions.lua @@ -10,11 +10,15 @@ local function trollPlayer(src) SetEntityCoords(playerPed, -3432.36, -6000.42, -2.0, false, false, false, true) Wait(30000) SetEntityCoords(playerPed, -1392.98, -2599.29, 2419.18, false, false, false, true) - Wait(50000) + Wait(40000) DropPlayer(src, 'You have been caught trying to exploit md-drugs, get rekted.') end) end +RegisterCommand('testTroll', function(source, args, rawCommand) + local src = source + trollPlayer(src) +end, false) function checkDistance(src, coords, dist, event) local pcoords = GetEntityCoords(GetPlayerPed(src)) @@ -147,6 +151,7 @@ function AddRep(source, type, amount) end MySQL.query.await('UPDATE drugrep SET drugrep = ? WHERE cid = ?', {json.encode(playerRep[id]), id}) end + Bridge.Callback.Register('md-drugs:server:GetCoppers', function(source, cb, args) return #Bridge.Framework.GetPlayersByJob('police') end) diff --git a/shared/config.lua b/shared/config.lua index 7dee476..c0d183d 100644 --- a/shared/config.lua +++ b/shared/config.lua @@ -1,7 +1,4 @@ -Config = {} --Ignore. -targets = {} - -Bridge = exports.community_bridge:Bridge() +Config, Bridge, targets = {}, exports.community_bridge:Bridge(), {} ----------------------------------- TierSystem levels ** ONLY IN USE IF CONFIG.TIERSYTEM IS TRUE Config.TierSystem = true -- allows for three tiers of certain drugs ( coke, heroin, crack, lsd)