From 5db30458eb5282c9821039fe62a8fdac360d9625 Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Fri, 30 Jan 2026 00:45:03 -0700 Subject: [PATCH] - big push --- client/TravellingMerchant.lua | 2 +- client/cocaine.lua | 16 +++++++++------- client/crack.lua | 7 ++++--- client/deliveries.lua | 4 +--- client/heroin.lua | 11 ++++++----- client/lean.lua | 6 +++--- client/lsd.lua | 9 +++++---- client/mescaline.lua | 3 ++- client/meth.lua | 15 ++++++++------- client/oxyruns.lua | 3 ++- client/pharma.lua | 15 +++++++++++++-- client/weed.lua | 7 ++++--- client/whippit.lua | 1 + client/xtc.lua | 9 +++++---- locales/en.json | 2 +- server/cocaine.lua | 10 +++++----- server/crack.lua | 4 ++-- server/heroin.lua | 8 ++++---- server/lean.lua | 16 +++------------- server/lsd.lua | 14 +++++++------- server/mescaline.lua | 2 +- server/meth.lua | 14 +++++++------- server/oxyruns.lua | 6 +++--- server/pharma.lua | 14 +++++++------- server/weed.lua | 10 +++++----- server/xtc.lua | 10 +++++----- 26 files changed, 114 insertions(+), 104 deletions(-) diff --git a/client/TravellingMerchant.lua b/client/TravellingMerchant.lua index 4b45027..a5d45bb 100644 --- a/client/TravellingMerchant.lua +++ b/client/TravellingMerchant.lua @@ -17,7 +17,7 @@ local function spawn() title = itemInfo.label, description = '$'..v, icon = itemInfo.image, - action = function() + onSelect = function() TriggerServerEvent('md-drugs:server:purchaseGoods', k) end } diff --git a/client/cocaine.lua b/client/cocaine.lua index f483e76..dd9f87a 100644 --- a/client/cocaine.lua +++ b/client/cocaine.lua @@ -1,5 +1,7 @@ local cuttingcoke = nil local baggingcoke = nil + +repeat Wait(100) until GlobalState.MDDrugsLocations.Cocaine ~= nil local locations = GlobalState.MDDrugsLocations.Cocaine local function CutCoke(coords, offset, rotation) @@ -58,7 +60,7 @@ local function BagCoke(coords, offset, rotation) Bridge.Anim.RequestDict(animDict, 500) local animDuration = GetAnimDuration(animDict, animName) * 1000 local ped = PlayerPedId() - local scenePos, sceneRot = vector3(coords.x + offset.x, coords.y + offset.y,coords.z + offset.z), rotation + local scenePos, sceneRot = vector3(coords.x + offset.x, coords.y + offset.y,coords.z + offset.z +0.03), rotation local scenes = { { { hash = "bkr_prop_coke_cutblock_01", animName = "break_weigh_"..ver.."box01"}, @@ -115,7 +117,7 @@ local function BagCoke(coords, offset, rotation) end for k, v in pairs (locations.MakePowder) do - Bridge.Target.AddBoxZone('cocaplant'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('cocaplant'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('coke.targetMakePow'), icon = Bridge.Language.Locale('coke.targetMakePowIcon'), @@ -132,12 +134,12 @@ for k, v in pairs (locations.MakePowder) do end for k, v in pairs (locations.CuttingCoke) do - Bridge.Target.AddBoxZone('cutcoke'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('cutcoke'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('coke.targetCutCoke'), icon = Bridge.Language.Locale('coke.targetCutCokeIcon'), action = function() - if not itemCheck('baking_soda') then return end + if not itemCheck('bakingsoda') then return end CutCoke(v.loc, v.offset, v.rotation) TriggerServerEvent("md-drugs:server:cutcokeone", k) end, @@ -151,7 +153,7 @@ for k, v in pairs (locations.CuttingCoke) do end for k, v in pairs (locations.BaggingCoke) do - Bridge.Target.AddBoxZone('bagcoke'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('bagcoke'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('coke.targetBagCoke'), icon = Bridge.Language.Locale('coke.targetBagCokeIcon'), @@ -170,7 +172,7 @@ for k, v in pairs (locations.BaggingCoke) do end for k, v in pairs (locations.cokeTele) do - Bridge.Target.AddBoxZone('coke_tele'..k, v.inside, vector3(v.l, v.w, 2.0), v.inside.w or 180.0,{ + Bridge.Target.AddBoxZone('coke_tele'..k, v.inside, v.size, v.inside.w or 180.0,{ { icon = Bridge.Language.Locale('coke.teleOutIcon'), label = Bridge.Language.Locale('coke.teleOut'), @@ -182,7 +184,7 @@ for k, v in pairs (locations.cokeTele) do end } }) - Bridge.Target.AddBoxZone('coke_teleout'..k, v.outside, vector3(v.l, v.w, 2.0), v.outside.w or 180.0,{ + Bridge.Target.AddBoxZone('coke_teleout'..k, v.outside, v.size, v.outside.w or 180.0,{ { icon = Bridge.Language.Locale('coke.teleInIcon'), label = Bridge.Language.Locale('coke.teleIn'), diff --git a/client/crack.lua b/client/crack.lua index 9bf9936..bfce187 100644 --- a/client/crack.lua +++ b/client/crack.lua @@ -1,12 +1,13 @@ +repeat Wait(100) until GlobalState.MDDrugsLocations.Crack ~= nil local locations = GlobalState.MDDrugsLocations.Crack for k, v in pairs (locations.makecrack) do - Bridge.Target.AddBoxZone('makeCrack'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('makeCrack'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('crack.targetMake'), icon = Bridge.Language.Locale('crack.makeIcon'), action = function() - if not itemCheck('baking_soda') then return end + if not itemCheck('bakingsoda') then return end if not minigame() then TriggerServerEvent("md-drugs:server:failcrackone", k) return @@ -23,7 +24,7 @@ for k, v in pairs (locations.makecrack) do end for k, v in pairs (locations.bagcrack) do - Bridge.Target.AddBoxZone('bagCrack'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('bagCrack'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('crack.targetBag'), icon = Bridge.Language.Locale('crack.bagIcon'), diff --git a/client/deliveries.lua b/client/deliveries.lua index db043dd..4fd2dc2 100644 --- a/client/deliveries.lua +++ b/client/deliveries.lua @@ -2,9 +2,7 @@ local dealer = {} local buyer = nil -repeat - Wait(100) -until GlobalState.MDDrugsLocations.Deliveries.dealers ~= nil +repeat Wait(100) until GlobalState.MDDrugsLocations.Deliveries.dealers ~= nil local function SpawnDealer() if #dealer >= 1 then diff --git a/client/heroin.lua b/client/heroin.lua index 876db1c..a67647c 100644 --- a/client/heroin.lua +++ b/client/heroin.lua @@ -1,6 +1,7 @@ local herointable = false local dirty = false +repeat Wait(100) until GlobalState.MDDrugsLocations.Heroin ~= nil local locations = GlobalState.MDDrugsLocations.Heroin local function createLabKit(coord, head) @@ -12,7 +13,7 @@ local function createLabKit(coord, head) icon = Bridge.Language.Locale('heroin.cookIcon'), label = Bridge.Language.Locale('heroin.targetCook'), action = function() - if not itemCheck('empty_vial') then return end + if not itemCheck('emptyvial') then return end if not minigame() then dirty = true @@ -61,7 +62,7 @@ local function createLabKit(coord, head) end for k, v in pairs (locations.dryplant) do - Bridge.Target.AddBoxZone('dryHeroin'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('dryHeroin'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('heroin.targetDry'), icon = Bridge.Language.Locale('heroin.dryIcon'), @@ -77,12 +78,12 @@ for k, v in pairs (locations.dryplant) do end for k, v in pairs (locations.cutheroinone) do - Bridge.Target.AddBoxZone('cutHeroin'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('cutHeroin'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('heroin.targetCutHeroin'), icon = Bridge.Language.Locale('heroin.cutIcon'), action = function() - if not itemCheck('baking_soda') then return end + if not itemCheck('bakingsoda') then return end if not progressbar(Bridge.Language.Locale('heroin.pbCutHeroin')) then return end TriggerServerEvent("md-drugs:server:cutheroin", k) end, @@ -132,7 +133,7 @@ Bridge.Callback.Register("md-drugs:client:setheroinlabkit", function() end) for k, v in pairs (locations.fillneedle) do - Bridge.Target.AddBoxZone('fillNeedle'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('fillNeedle'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('heroin.targetFill'), icon = Bridge.Language.Locale('heroin.fillNeedleIcon'), diff --git a/client/lean.lua b/client/lean.lua index 0f6b869..175ec92 100644 --- a/client/lean.lua +++ b/client/lean.lua @@ -1,7 +1,7 @@ local started = false -local hit = 0 local leanCar = nil +repeat Wait(100) until GlobalState.MDDrugsRecipes.Lean ~= nil local location = GlobalState.MDDrugsLocations.Lean local function SpawnCarPedChase(loc) @@ -28,7 +28,7 @@ local function SpawnCarPedChase(loc) started = false return end - + Bridge.Notify.SendNotify(Bridge.Language.Locale('lean.chaseStarted'), 'success') SetPedIntoVehicle(pilot2, leanCar, 1) FreezeEntityPosition(driver, true) FreezeEntityPosition(pilot2, true) @@ -77,7 +77,7 @@ for k, v in pairs (location.SyrupVendor) do icon = Bridge.Language.Locale('lean.startMissionIcon'), label = Bridge.Language.Locale('lean.startMission'), action = function() - SpawnCarPedChase() + SpawnCarPedChase(k) end, canInteract = function() if not handleGang(v.gang) then return false end diff --git a/client/lsd.lua b/client/lsd.lua index 996aeb3..a27f38d 100644 --- a/client/lsd.lua +++ b/client/lsd.lua @@ -1,5 +1,6 @@ local tableout = false local dirtylsd = false +repeat Wait(100) until GlobalState.MDDrugsRecipes.LSD ~= nil local locations = GlobalState.MDDrugsLocations.LSD @@ -22,7 +23,7 @@ local function createLabKit(coord, head) TriggerServerEvent("md-drugs:server:failheating") return end - if not progressbar(Bridge.Language.Locale('lsd.heating'), 7000, 'uncuff') then return end + if not progressbar(Bridge.Language.Locale('lsd.heating'), 7000) then return end TriggerServerEvent("md-drugs:server:heatliquid") end, canInteract = function() @@ -86,7 +87,7 @@ local function createLabKit(coord, head) end for k, v in pairs (locations.lysergicacid) do - Bridge.Target.AddBoxZone('lysergicacid'..k,v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('lysergicacid'..k,v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('lsd.targetLys'), icon = Bridge.Language.Locale('lsd.targetLysIcon'), @@ -104,7 +105,7 @@ for k, v in pairs (locations.lysergicacid) do end for k, v in pairs (locations.diethylamide) do - Bridge.Target.AddBoxZone('diethylamide'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('diethylamide'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('lsd.targetDie'), icon = Bridge.Language.Locale('lsd.targetDieIcon'), @@ -122,7 +123,7 @@ for k, v in pairs (locations.diethylamide) do end for k, v in pairs (locations.gettabs) do - Bridge.Target.AddBoxZone('gettabs'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('gettabs'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('lsd.targetBuyTab'), icon = Bridge.Language.Locale('lsd.targetBuyTabIcon'), diff --git a/client/mescaline.lua b/client/mescaline.lua index b3f8d1c..2a566f0 100644 --- a/client/mescaline.lua +++ b/client/mescaline.lua @@ -1,5 +1,6 @@ local badTrip = 100 +repeat Wait(100) until GlobalState.MDDrugsRecipes.Mescaline ~= nil local locations = GlobalState.MDDrugsLocations.Mescaline local function AlienEffect() CreateThread(function() @@ -15,7 +16,7 @@ end for k, v in pairs (locations.DryOutMescaline) do - Bridge.Target.AddBoxZone('dryoutMesc'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0,{ + Bridge.Target.AddBoxZone('dryoutMesc'..k, v.loc, v.size, v.loc.w or 180.0,{ { label = Bridge.Language.Locale('mesc.targetDry'), icon = 'fa-solid fa-temperature-high', diff --git a/client/meth.lua b/client/meth.lua index 5a12cab..06bd3dd 100644 --- a/client/meth.lua +++ b/client/meth.lua @@ -1,4 +1,5 @@ local amonia, tray, heated, active, trays, startedmeth, methVan = false, false, false, false, nil, false, nil +repeat Wait(100) until GlobalState.MDDrugsLocations.Meth ~= nil local locations = GlobalState.MDDrugsLocations.Meth --- meth heist @@ -306,7 +307,7 @@ end for k, v in pairs (locations.CookMeth) do - Bridge.Target.AddBoxZone('cookMeth'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('cookMeth'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('meth.targetCook'), icon = Bridge.Language.Locale('meth.targetCookIcon'), @@ -335,7 +336,7 @@ for k, v in pairs (locations.CookMeth) do end for k, v in pairs (locations.MethDials) do - Bridge.Target.AddBoxZone('adjustMethDials'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('adjustMethDials'..k, v.loc, v.size, v.loc.w or 180.0, { { name = 'adjustdials', icon = Bridge.Language.Locale('meth.targetHeatIcon'), @@ -352,7 +353,7 @@ for k, v in pairs (locations.MethDials) do end for k, v in pairs (locations.MethSmash) do - Bridge.Target.AddBoxZone('smashMeth'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('smashMeth'..k, v.loc, v.size, v.loc.w or 180.0, { { name = 'smash', icon = Bridge.Language.Locale('meth.targetSmashIcon'), @@ -369,7 +370,7 @@ for k, v in pairs (locations.MethSmash) do end for k, v in pairs (locations.MethTele) do - Bridge.Target.AddBoxZone('meth_tele'..k, v.inside, vector3(v.l, v.w, 1.0), v.rot, { + Bridge.Target.AddBoxZone('meth_tele'..k, v.inside, v.size, v.rot, { { icon = Bridge.Language.Locale('meth.teleOutIcon'), label = Bridge.Language.Locale('meth.teleOut'), @@ -381,7 +382,7 @@ for k, v in pairs (locations.MethTele) do end } }) - Bridge.Target.AddBoxZone('meth_teleout'..k, v.outside, vector3(v.l, v.w, 1.0), v.rot, { + Bridge.Target.AddBoxZone('meth_teleout'..k, v.outside, v.size, v.rot, { { icon = Bridge.Language.Locale('meth.teleInIcon'), label = Bridge.Language.Locale('meth.teleIn'), @@ -403,7 +404,7 @@ RegisterCommand('offset', function() end) for k, v in pairs (locations.MethEph) do - Bridge.Target.AddBoxZone('stealMethEph'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('stealMethEph'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('meth.targetStealEPH'), icon = Bridge.Language.Locale('meth.targetStealEPHIcon'), @@ -418,7 +419,7 @@ for k, v in pairs (locations.MethEph) do }) end for k, v in pairs (locations.MethAce) do - Bridge.Target.AddBoxZone('stealMethAce'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('stealMethAce'..k, v.loc, v.size, v.loc.w or 180.0, { { label = Bridge.Language.Locale('meth.targetStealACE'), icon = Bridge.Language.Locale('meth.targetStealACEIcon'), diff --git a/client/oxyruns.lua b/client/oxyruns.lua index f1efd99..64934a8 100644 --- a/client/oxyruns.lua +++ b/client/oxyruns.lua @@ -1,5 +1,6 @@ local carryPackage = nil local onMission = false +repeat Wait(100) until GlobalState.MDDrugsLocations.Oxy ~= nil local locations = GlobalState.MDDrugsLocations.Oxy local pdAlert = 90 local vehicle = nil @@ -46,7 +47,7 @@ local function getRoute() end for k, v in pairs(locations.OxyPayForTruck) do - Bridge.Target.AddBoxZone('oxyTruckPur' ..k , v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('oxyTruckPur' ..k , v.loc, v.size, v.loc.w or 180.0, { { icon = Bridge.Language.Locale('oxy.targetPayIcon'), label = Bridge.Language.Locale('oxy.targetPay'), diff --git a/client/pharma.lua b/client/pharma.lua index b5fde00..7210f2a 100644 --- a/client/pharma.lua +++ b/client/pharma.lua @@ -1,3 +1,4 @@ +repeat Wait(100) until GlobalState.MDDrugsLocations.Pharma ~= nil local locations = GlobalState.MDDrugsLocations.Pharma Bridge.Callback.Register("md-drugs:client:prescriptionpad", function( data, op) @@ -11,7 +12,17 @@ Bridge.Callback.Register("md-drugs:client:prescriptionpad", function( data, op) {type = 'select', title = Bridge.Language.Locale('pharma.input.title2'), options = op} }) if not input[1] then return end - if not progressbar(Bridge.Language.Locale('pharma.write'), 4000, 'notepad') then return end + if not progressbar(Bridge.Language.Locale('pharma.write'), 4000, { + dict = 'missheistdockssetup1clipboard@base', + clip = 'base', + flag = 49, + prop = { + model = 'prop_notepad_01', + bone = 18905, + pos = {0.1, 0.02, 0.03}, + rot = { -90.0, 0.0, 0.0} + } + }) then return end return {who = input[1], what = input[2]} end) @@ -22,7 +33,7 @@ end) for k, v in pairs (locations.FillPrescription) do - Bridge.Target.AddBoxZone('pharma' ..k , v.loc,vector3(v.l, v.w, 1.0), v.loc.w or 180, { + Bridge.Target.AddBoxZone('pharma' ..k , v.loc,v.size, v.loc.w or 180, { { icon = Bridge.Language.Locale('pharma.fillIcon'), label = Bridge.Language.Locale('pharma.targetFill'), diff --git a/client/weed.lua b/client/weed.lua index dad3850..3a069d4 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -1,7 +1,8 @@ local exploded, drying = false, false +repeat Wait(100) until GlobalState.MDDrugsLocations.Weed ~= nil and GlobalState.MDDrugsRecipes.Weed ~= nil local locations, recipes = GlobalState.MDDrugsLocations.Weed, GlobalState.MDDrugsRecipes.Weed for k, v in pairs (locations.WeedDry) do - Bridge.Target.AddBoxZone('weed_dry'..k, v.loc, vector3(v.l or 1.0, v.w or 1.0, 1.0), v.loc.w or 180.0, { + Bridge.Target.AddBoxZone('weed_dry'..k, v.loc, v.size, v.loc.w or 180.0, { { icon = Bridge.Language.Locale('weed.targetDryIcon'), label = Bridge.Language.Locale('weed.targetDry'), @@ -36,7 +37,7 @@ for k, v in pairs (locations.WeedDry) do end for k, v in pairs (locations.WeedTele) do - Bridge.Target.AddBoxZone('weed_tele'..k, v.inside, vector3(v.l or 1.0, v.w or 1.0, 1.0), v.rot or 180.0, { + Bridge.Target.AddBoxZone('weed_tele'..k, v.inside, v.size, v.rot or 180.0, { { icon = Bridge.Language.Locale('weed.teleportOutIcon'), label = Bridge.Language.Locale('weed.teleportOut'), @@ -45,7 +46,7 @@ for k, v in pairs (locations.WeedTele) do end } }) - Bridge.Target.AddBoxZone('weed_teleout'..k, v.outside, vector3(v.l or 1.0, v.w or 1.0, 1.0), v.rot or 180.0, { + Bridge.Target.AddBoxZone('weed_teleout'..k, v.outside, v.size, v.rot or 180.0, { { icon = Bridge.Language.Locale('weed.teleportInIcon'), label = Bridge.Language.Locale('weed.teleportIn'), diff --git a/client/whippit.lua b/client/whippit.lua index 4adb885..34a1788 100644 --- a/client/whippit.lua +++ b/client/whippit.lua @@ -1,4 +1,5 @@ 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/client/xtc.lua b/client/xtc.lua index 7fff8dd..5566e04 100644 --- a/client/xtc.lua +++ b/client/xtc.lua @@ -1,4 +1,5 @@ local xtcpress = false +repeat Wait(100) until GlobalState.MDDrugsLocations.XTC ~= nil local locations = GlobalState.MDDrugsLocations.XTC local function getRecipeList(tbl, type) @@ -75,7 +76,7 @@ Bridge.Callback.Register('md-drugs:client:setpress', function(xtcData) end) for k, v in pairs(locations.mdp2p) do - Bridge.Target.AddBoxZone('mdp2p'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, { + Bridge.Target.AddBoxZone('mdp2p'..k, v.loc, v.size, v.rot or 180.0, { { icon = Bridge.Language.Locale('xtc.mdp2pIcon'), label = Bridge.Language.Locale('xtc.targetStealMDP2P'), @@ -91,7 +92,7 @@ for k, v in pairs(locations.mdp2p) do }) end for k, v in pairs(locations.isosafrole) do - Bridge.Target.AddBoxZone('isosafrole'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, { + Bridge.Target.AddBoxZone('isosafrole'..k, v.loc, v.size, v.rot or 180.0, { { icon = Bridge.Language.Locale('xtc.isosafroleIcon'), label = Bridge.Language.Locale('xtc.targetStealIsosafrole'), @@ -108,7 +109,7 @@ for k, v in pairs(locations.isosafrole) do end for k, v in pairs(locations.rawxtcloc) do - Bridge.Target.AddBoxZone('xtcraw'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, { + Bridge.Target.AddBoxZone('xtcraw'..k, v.loc, v.size, v.rot or 180.0, { { icon = Bridge.Language.Locale('xtc.rawIcon'), label = Bridge.Language.Locale('xtc.targetRaw'), @@ -177,7 +178,7 @@ for k, v in pairs(locations.xtcpress) do end for k, v in pairs (locations.stamp) do - Bridge.Target.AddBoxZone('xtcstamp'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, { + Bridge.Target.AddBoxZone('xtcstamp'..k, v.loc, v.size, v.rot or 180.0, { { icon = Bridge.Language.Locale('xtc.stampIcon'), label = Bridge.Language.Locale('xtc.targetStamp'), diff --git a/locales/en.json b/locales/en.json index e173245..bbd4a31 100644 --- a/locales/en.json +++ b/locales/en.json @@ -211,7 +211,7 @@ "alreadyCarrying": "You Are Already Carrying A Package", "notOn": "You Are Not On A Route", "notOnOxyRun": "Player: %s attempted to exploit the oxy run event by triggering the give event when not on an oxy run.", - "mismatchOxyVan": "Player: %s Passed Vehicle: %s for Oxy Van but The Proper Vehicle is: %s " + "mismatchOxyVan": "Player: %s Passed Vehicle: %s for Oxy Van " }, "pharma": { diff --git a/server/cocaine.lua b/server/cocaine.lua index a737f77..20ed3ee 100644 --- a/server/cocaine.lua +++ b/server/cocaine.lua @@ -21,17 +21,17 @@ Recipes.Cocaine = { GlobalState.MDDrugsRecipes = Recipes Locations.Cocaine = { - MakePowder = { - {loc = vector3(1086.20, -3195.30, -39.20), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + MakePowder = { -- size = vector3(x,y,z) x = length, y = width, z = height + {loc = vector3(1086.20, -3195.30, -39.20), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, CuttingCoke = { - {loc = vector3(1095.61, -3195.62, -39.13), l = 1.0, w = 1.0, rot = 45.0, offset = vec3(-1.782227, 0.445068, -0.502701), rotation = vector3(0,0,0), gang = ""}, + {loc = vector3(1095.61, -3195.62, -39.13), size = vector3(1.0, 1.0, 2.0), offset = vec3(-1.782227, 0.445068, -0.502701), rotation = vector3(0,0,0), gang = ""}, }, BaggingCoke = { - {loc = vector3(1093.16, -3195.78, -39.19), l = 1.0, w = 1.0, rot = 45.0,offset = vec3(4.515137, 2.542969, -0.814194), rotation = vector3(0,0,180.0), gang = ""}, + {loc = vector3(1093.16, -3195.78, -39.19), size = vector3(1.0, 1.0, 2.0), offset = vec3(4.515137, 2.542969, -0.814194), rotation = vector3(0,0,180.0), gang = ""}, }, cokeTele = { - {inside = vector3(1088.81, -3187.57, -38.99), outside = vector3(198.16, -1276.92, 29.33), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {inside = vector3(1088.81, -3187.57, -38.99), outside = vector3(198.16, -1276.92, 29.33), size = vector3(1.0, 1.0, 2.0), gang = ""}, } } GlobalState.MDDrugsLocations = Locations diff --git a/server/crack.lua b/server/crack.lua index 9b73173..624df1a 100644 --- a/server/crack.lua +++ b/server/crack.lua @@ -16,10 +16,10 @@ GlobalState.MDDrugsRecipes = Recipes Locations.Crack = { makecrack = { -- make crack with baking soda with cut coke 1-3 - {loc = vector3(2433.47, 4970.02, 42.18), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(2433.47, 4970.02, 42.18), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, bagcrack = { --- bag crack 1-3 stages - {loc = vector3(2436.55, 4964.96, 42.18), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(2436.55, 4964.96, 42.18), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, } GlobalState.MDDrugsLocations = Locations diff --git a/server/heroin.lua b/server/heroin.lua index ff8e716..0c79128 100644 --- a/server/heroin.lua +++ b/server/heroin.lua @@ -27,16 +27,16 @@ GlobalState.MDDrugsRecipes = Recipes Locations.Heroin = { dryplant = { -- turn resin into powder - {loc = vector3(-1353.77, -335.58, 43.92), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(-1353.77, -335.58, 43.92), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, cutheroinone = { -- cut heroin stage 1-3 with baking soda - {loc = vector3(-1360.14, -337.03, 43.92), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(-1360.14, -337.03, 43.92), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, fillneedle = { -- fill needles with heroin - {loc = vector3(-1366.32, -334.40, 44.44), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(-1366.32, -334.40, 44.44), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, buyKit = { - {ped = 'a_m_m_farmer_01',loc = vector4(-1366.32, -334.40, 44.44,180.0), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {ped = 'a_m_m_farmer_01',loc = vector4(-1366.32, -334.40, 44.44,180.0), size = vector3(1.0, 1.0, 2.0), gang = ""}, } } GlobalState.MDDrugsLocations = Locations diff --git a/server/lean.lua b/server/lean.lua index ff4bf58..6ef80a0 100644 --- a/server/lean.lua +++ b/server/lean.lua @@ -2,19 +2,9 @@ Locations = Locations or {} Recipes = Recipes or {} local onRun = {} Locations.Lean = { - MakeLean = { - { - loc = vector3(2635.81, 4240.57, 45.32), - checks = { -- these can be arrays like {'police', 'ambulance'} or just a single string like 'police' - --gang = {}, - --item = {}, - --job = {}, - --citizenid = {} - } - }, - }, + SyrupVendor = { - {ped = 'a_m_m_farmer_01', loc = vector4(365.21, -578.77, 39.30, 347.23), l = 1.0, w = 1.0, rot = 347.23, gang = ""}, + {ped = 'a_m_m_farmer_01', loc = vector4(365.21, -578.77, 39.30, 347.23), gang = ""}, }, StartLoc = { -- where truck spawns for lean and meth missions vector3(-2307.22, 434.77, 174.47), @@ -74,7 +64,7 @@ RegisterServerEvent('md-drugs:server:givelean', function() onRun[src].taken = onRun[src].taken + 1 local item, amount = math.random(1,2) == 1 and 'mdlean' or 'mdreddextro', math.random(1,3) Bridge.Inventory.AddItem(src, item, amount) - if onRun[src].taken < 5 then + if onRun[src].taken >= 5 then Bridge.Notify.SendNotify(src, Bridge.Language.Locale('lean.maxTaken'), 'error') DeleteEntity(veh) onRun[src] = nil diff --git a/server/lsd.lua b/server/lsd.lua index 4a5e3da..6855dc7 100644 --- a/server/lsd.lua +++ b/server/lsd.lua @@ -11,19 +11,19 @@ Recipes.LSD = { GlobalState.MDDrugsRecipes = Recipes Locations.LSD = { lysergicacid = { -- get lysergic acid - {loc = vector3(-1381.21, -327.75, 39.85), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, - {loc = vector3(2405.53, 5008.39, 46.02), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(-1381.21, -327.75, 39.85),size = vector3(1.0, 1.0, 2.0), gang = ""}, + {loc = vector3(2405.53, 5008.39, 46.02), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, diethylamide = { -- get diethylamide - {loc = vector3(-1372.89, -319.47, 39.05), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, - {loc = vector3(2408.38, 5011.18, 46.08), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(-1372.89, -319.47, 39.05), size = vector3(1.0, 1.0, 2.0), gang = ""}, + {loc = vector3(2408.38, 5011.18, 46.08), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, gettabs = { -- buy tab paper - {loc = vector3(-1378.26, -336.56, 39.31), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, - {loc = vector3(2409.59, 5012.45, 46.09), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(-1378.26, -336.56, 39.31), size = vector3(1.0, 1.0, 2.0), gang = ""}, + {loc = vector3(2409.59, 5012.45, 46.09), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, buyLSDkit = { - {ped = 'g_f_y_families_01', loc = vector4(-1376.66, -325.52, 39.63, 142.1), l = 1.0, w = 1.0, rot = 283.51, gang = ""}, + {ped = 'g_f_y_families_01', loc = vector4(-1376.66, -325.52, 39.63, 142.1), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, } GlobalState.MDDrugsLocations = Locations diff --git a/server/mescaline.lua b/server/mescaline.lua index 3e96234..1929696 100644 --- a/server/mescaline.lua +++ b/server/mescaline.lua @@ -2,7 +2,7 @@ Recipes, Locations = Recipes or {}, Locations or {} Locations.Mescaline = { DryOutMescaline = { -- where to dry out your mescaline - {loc = vector3(1850.12, 2595.23, 45.67), l = 1.0, w = 1.0, rot = 0.0, gang = ""}, + {loc = vector3(1850.12, 2595.23, 45.67), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, } GlobalState.MDDrugsLocations = Locations diff --git a/server/meth.lua b/server/meth.lua index 105d0f1..367f676 100644 --- a/server/meth.lua +++ b/server/meth.lua @@ -3,22 +3,22 @@ local onRun = {} local vehicles = {} Locations.Meth = { CookMeth = { - {loc = vector3(1006.09, -3200.59, -38.52), l = 1.0, w = 1.0, rot = 45.0, offset = vec3(4.79, 2.13, -0.41), rotation = vector3(0,0,0.0), gang = ""}, + {loc = vector3(1006.09, -3200.59, -38.52), size = vector3(1.0, 1.0, 2.0), offset = vec3(4.79, 2.13, -0.41), rotation = vector3(0,0,0.0), gang = ""}, }, MethDials = { - {loc = vector3(1007.89, -3201.17, -38.99),l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(1007.89, -3201.17, -38.99), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, MethSmash = { - {loc = vector3(1012.04, -3194.96, -38.99), bucket = vector4(1012.86, -3194.13, -39.20, 90.00), l = 1.0, w = 1.0, rot = 45.0, offset = vec3(-3.143311, -1.666748, -1.010128), rotation = vector3(0,0,0.0), gang = ""}, + {loc = vector3(1012.04, -3194.96, -38.99), bucket = vector4(1012.86, -3194.13, -39.20, 90.00), size = vector3(1.0, 1.0, 2.0), offset = vec3(-3.143311, -1.666748, -1.010128), rotation = vector3(0,0,0.0), gang = ""}, }, BagMeth = { - {loc = vector3(1014.25, -3194.93, -38.99), l = 1.0, w = 1.0, rot = 45.0, offset = vec3(-4.9, -1.70, -1.01), rotation = vector3(0,0,0.0), gang = ""}, + {loc = vector3(1014.25, -3194.93, -38.99), size = vector3(1.0, 1.0, 2.0), offset = vec3(-4.9, -1.70, -1.01), rotation = vector3(0,0,0.0), gang = ""}, }, MethEph = { -- get ephedrine - {loc = vector3(3559.86, 3673.9, 28.13), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(3559.86, 3673.9, 28.13), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, MethAce = { -- get acetone - {loc = vector3(3535.41, 3661.05, 28.12), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(3535.41, 3661.05, 28.12), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, MethHeist = { {loc = vector4(-1520.84, 827.72, 181.66, 184.13), ped = 'a_m_m_farmer_01', gang = ""}, @@ -29,7 +29,7 @@ Locations.Meth = { vector3(-224.89, 6388.32, 31.59) }, MethTele = { - {inside = vector3(996.91, -3200.83, -36.39), outside = vector3(-2222.04, 303.99, 174.6), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {inside = vector3(996.91, -3200.83, -36.39), outside = vector3(-2222.04, 303.99, 174.6), size = vector3(1.0, 1.0, 2.0), gang = ""}, } } GlobalState.MDDrugsLocations = Locations diff --git a/server/oxyruns.lua b/server/oxyruns.lua index cfddbc4..9398908 100644 --- a/server/oxyruns.lua +++ b/server/oxyruns.lua @@ -8,7 +8,7 @@ local onRoute = {} local vehicles = {} Locations.Oxy = { OxyPayForTruck = { - {loc = vector3(1437.64, -1491.91, 63.62), truckSpawn = vector4(1450.87, -1482.13, 63.22, 69.95), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(1437.64, -1491.91, 63.62), truckSpawn = vector4(1450.87, -1482.13, 63.22, 69.95),size = vector3(1.0, 1.0, 2.0), gang = ""}, }, oxylocations = { vector4(-2352.32, 266.78, 165.3, 23.46), @@ -63,7 +63,7 @@ RegisterServerEvent('md-drugs:server:giveoxybox', function() local vehicle = vehicles[src] if not vehicle or GetEntityModel(vehicle) ~= GetHashKey("burrito3") then - Bridge.Prints.Warn(Bridge.Language.Locale('oxy.mismatchOxyVan', Bridge.Framework.GetPlayerIdentifier(src), vehicle, vehicles[src])) + Bridge.Prints.Warn(Bridge.Language.Locale('oxy.mismatchOxyVan', Bridge.Framework.GetPlayerIdentifier(src), vehicle)) return end @@ -80,7 +80,7 @@ RegisterServerEvent('md-drugs:server:giveoxybox', function() local item = itemList[math.random(1, #itemList)] Bridge.Framework.AddAccountBalance(src, 'cash', cash) if itemchance <= prices.itemChance then - Bridge.Framework.AddItem(src, item.item, item.amount) + Bridge.Inventory.AddItem(src, item.item, item.amount) end end) diff --git a/server/pharma.lua b/server/pharma.lua index 5b53f81..8ababa9 100644 --- a/server/pharma.lua +++ b/server/pharma.lua @@ -2,7 +2,7 @@ Locations = Locations or {} Locations.Pharma = { FillPrescription = { -- where to fill out your prescription - {loc = vector3(2855.62, 4446.73, 48.53), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(2855.62, 4446.73, 48.53), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, } GlobalState.MDDrugsLocations = Locations @@ -40,7 +40,7 @@ Bridge.Framework.RegisterUsableItem('prescription_pad', function(source, item) } local data = Bridge.Callback.Trigger('md-drugs:client:prescriptionpad', src, near, options) if not data then return Bridge.Notify.SendNotify(src, Bridge.Language.Locale('pharma.canceled'), "error") end - Bridge.Framework.AddItem(data.who, data.what, 1) + Bridge.Inventory.AddItem(data.who, data.what, 1) end end) @@ -58,8 +58,8 @@ for m, d in pairs (pharmabottle) do } for k, v in pairs (get) do if d == k then - if Bridge.Framework.RemoveItem(src, d, 1) then - Bridge.Framework.AddItem(src, v, math.random(10,30)) + if Bridge.Inventory.RemoveItem(src, d, 1) then + Bridge.Inventory.AddItem(src, v, math.random(10,30)) Bridge.Notify.SendNotify(src,Bridge.Language.Locale('pharma.unbottle'), "success") end end @@ -82,9 +82,9 @@ RegisterServerEvent('md-drugs:server:fillprescription', function(num) xanax_prescription = 'xanaxbottle' } for k, v in pairs (pres) do - if Bridge.Framework.HasItem(src, k, 1) then - Bridge.Framework.RemoveItem(src, k, 1) - Bridge.Framework.AddItem(src, v, 1) + if Bridge.Inventory.HasItem(src, k, 1) then + Bridge.Inventory.RemoveItem(src, k, 1) + Bridge.Inventory.AddItem(src, v, 1) break end end diff --git a/server/weed.lua b/server/weed.lua index d296b98..530689f 100644 --- a/server/weed.lua +++ b/server/weed.lua @@ -3,7 +3,7 @@ Locations, Recipes = Locations or {}, Recipes or {} Locations.Weed = { WeedTele = { -- where you tele out of weed - {inside = vector3(1066.31, -3183.36, -39.16), outside = vector3(244.74, 374.54, 105.74), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {inside = vector3(1066.31, -3183.36, -39.16), outside = vector3(244.74, 374.54, 105.74), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, MakeButter = { {loc = vector4(1045.43, -3198.75, -38.15, 270.0), prop = 'prop_cooker_03', checks = {}}, @@ -12,10 +12,10 @@ Locations.Weed = { {loc = vector4(1038.8, -3198.68, -38.17, 90.0), prop = 'prop_cooker_03', checks = {}}, }, WeedDry = { - {loc = vector3(1043.0, -3191.59, -38.39),}, - {loc = vector3(1041.0, -3191.59, -38.39),}, - {loc = vector3(1045.0, -3191.59, -38.39),}, - {loc = vector3(1039.0, -3191.59, -38.39),}, + {loc = vector3(1043.0, -3191.59, -38.39), size = vector3(1.0, 1.0, 2.0)}, + {loc = vector3(1041.0, -3191.59, -38.39), size = vector3(1.0, 1.0, 2.0)}, + {loc = vector3(1045.0, -3191.59, -38.39), size = vector3(1.0, 1.0, 2.0)}, + {loc = vector3(1039.0, -3191.59, -38.39), size = vector3(1.0, 1.0, 2.0)}, }, WeedSalesman = { {loc = vector4(1030.77, -3203.18, -38.2, 262.37), ped = 'a_m_m_farmer_01', gang = ""}, diff --git a/server/xtc.lua b/server/xtc.lua index cc8275e..adb7b41 100644 --- a/server/xtc.lua +++ b/server/xtc.lua @@ -38,19 +38,19 @@ Recipes.XTC = { Locations.XTC = { isosafrole = { -- where to steal isosafrole - {loc = vector3(844.39, -902.92, 25.42), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(844.39, -902.92, 25.42), size = vector3(1.0, 1.0, 2.0), gang = ""}, }, mdp2p = { -- where to steal mdp2p - {loc = vector3(844.4, -898.79, 25.23), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(844.4, -898.79, 25.23), size = vector3(1.0, 1.0, 2.0), rot = 45.0, gang = ""}, }, rawxtcloc = { -- where to combine the 2 ingridents to make raw xtc - {loc = vector3(844.71, -910.33, 25.37), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(844.71, -910.33, 25.37), size = vector3(1.0, 1.0, 2.0), rot = 45.0, gang = ""}, }, xtcpress = { - {ped = 'g_f_y_families_01',loc = vector4(845.82, -884.79, 25.18, 180.0), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {ped = 'g_f_y_families_01',loc = vector4(845.82, -884.79, 25.18, 180.0), size = vector3(1.0, 1.0, 2.0), rot = 45.0, gang = ""}, }, stamp = { -- where to stamp pills - {loc = vector3(844.71, -900.56, 25.43), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(844.71, -900.56, 25.43), size = vector3(1.0, 1.0, 2.0), rot = 45.0, gang = ""}, }, } GlobalState.MDDrugsLocations = Locations