- 80%

client/oxyruns.lua

@@ -1,18 +1,19 @@
 local carryPackage = nil
 local onMission = false
-local locations = ps.callback('md-drugs:server:GetOxyLocs')
+local locations = GlobalState.MDDrugsLocations.Oxy
 local pdAlert =  90
+local vehicle = nil
 
 local function getRoute()
-	local Route = ps.callback('md-drugs:server:getRoute')
+	local Route = Bridge.Callback.Trigger('md-drugs:server:getRoute')
     if not Route then
 		Bridge.Notify.SendNotify(Bridge.Language.Locale('oxy.ditchCar'), "error")
 		onMission = false
 		return false
 	end
-
+	local Route = locations.oxylocations[Route]
     SetNewWaypoint(Route.x, Route.y)
-	ps.requestModel('g_m_y_famdnf_01', 30000)
+	requestModel('g_m_y_famdnf_01', 30000)
     local oxybuyer = CreatePed(0, 'g_m_y_famdnf_01',Route.x,Route.y,Route.z-1, Route.w, false, false)
 	Freeze(oxybuyer, true, Route.w)
 	local timeOut = 300
@@ -23,13 +24,13 @@ local function getRoute()
 	until #(GetEntityCoords(PlayerPedId()) - vector3(Route.x,Route.y,Route.z)) < 5.0 or timeOut == 0
 
 	PoliceCall(pdAlert)
-	ps.entityTarget(oxybuyer,{
+	Bridge.Target.AddLocalEntity(oxybuyer,{
 		{ 
 			label = Bridge.Language.Locale('oxy.targetHandoff'),
 			icon = "fa-solid fa-dollar-sign",
 			action = function()
 				if carryPackage then
-					if not ps.progressbar(Bridge.Language.Locale('oxy.handingoff'), 4000, 'uncuff') then return end
+					if not progressbar(Bridge.Language.Locale('oxy.handingoff'), 4000, 'uncuff') then return end
 					TriggerServerEvent("md-drugs:server:giveoxybox")
 					DeleteEntity(oxybuyer)
 					DetachEntity(carryPackage, true, true)
@@ -45,28 +46,24 @@ local function getRoute()
 end
 
 for k, v in pairs(locations.OxyPayForTruck) do
-	ps.boxTarget('oxyTruckPur' ..k , v.loc, {length = v.l, width = v.w, heading = v.rot}, {
+	Bridge.Target.AddBoxZone('oxyTruckPur' ..k ,  v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, {
 		{
 			icon = 'fa-solid fa-truck-fast',
 			label = Bridge.Language.Locale('oxy.targetPay'),
 			action = function()
-				ps.requestModel("burrito3", 30000)
+				requestModel("burrito3", 30000)
 
-				local paid = ps.callback('md-drugs:server:payfortruck', false)
+				local paid = Bridge.Callback.Trigger('md-drugs:server:payfortruck', k)
 				if not paid then return end
-				local oxycar = CreateVehicle("burrito3",v.truckSpawn.x, v.truckSpawn.y, v.truckSpawn.z, v.truckSpawn.w, true, false)
-
-    			if Config.Fuel == "ox_fuel" then
-					Entity(oxycar).state.fuel = 100.0
-				else
-    				exports[Config.Fuel]:SetFuel(oxycar, 100.0)
-				end
-    			TriggerEvent("vehiclekeys:client:SetOwner", GetVehicleNumberPlateText(oxycar))
+				vehicle = CreateVehicle("burrito3",v.truckSpawn.x, v.truckSpawn.y, v.truckSpawn.z, v.truckSpawn.w, true, false)
+				SetVehicleFuelLevel(vehicle, 100.0)
+    			local plate = GetVehicleNumberPlateText(vehicle)
+				Bridge.VehicleKey.GiveKeys(vehicle, plate)
 				Bridge.Notify.SendNotify(Bridge.Language.Locale('oxy.keys'), 'success')
 				onMission = true
-				getRoute()
-
-				ps.entityTarget(oxycar,  {
+				TriggerServerEvent('md-drugs:server:startOxyRun', NetworkGetNetworkIdFromEntity(vehicle))
+				
+				Bridge.Target.AddLocalEntity(vehicle,  {
 					{
 						icon = "fa-solid fa-box",
 						label = Bridge.Language.Locale('oxy.targetGetPackage'),
@@ -75,9 +72,9 @@ for k, v in pairs(locations.OxyPayForTruck) do
 								Bridge.Notify.SendNotify(Bridge.Language.Locale('oxy.alreadyCarrying'), "error")
 							else
 								local pos = GetEntityCoords(PlayerPedId(), true)
-								ps.requestAnim('anim@heists@box_carry@')
+								Bridge.Anim.RequestDict('anim@heists@box_carry@')
 								TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
-								ps.requestModel("hei_prop_drug_statue_box_big")
+								requestModel("hei_prop_drug_statue_box_big")
 								carryPackage = CreateObject("hei_prop_drug_statue_box_big", pos.x, pos.y, pos.z, true, true, true)
 								AttachEntityToEntity(carryPackage, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 57005), 0.05, 0.1, -0.3, 300.0, 250.0, 20.0, true, true, false, true, 1, true)
 							end
@@ -87,6 +84,8 @@ for k, v in pairs(locations.OxyPayForTruck) do
 						end
 					}
 				})
+				Wait(1000)
+				getRoute()
 			end,
 			canInteract = function()
 				if onMission then