From ff21e76119938780f20fbb1f02a1b338ec54d1ab Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:51:37 -0500 Subject: [PATCH] compat cd_dispatchm tk_dispatch --- modules/dispatch/_default/client/client.lua | 27 +------------------ .../dispatch/cd_dispatch/client/client.lua | 24 +++++++++++++++++ .../dispatch/cd_dispatch/server/server.lua | 2 ++ .../linden_outlawalert/client/client.lua | 2 +- .../dispatch/tk_dispatch/client/client.lua | 20 ++++++++++++++ .../dispatch/tk_dispatch/server/server.lua | 2 ++ 6 files changed, 50 insertions(+), 27 deletions(-) create mode 100644 modules/dispatch/cd_dispatch/client/client.lua create mode 100644 modules/dispatch/cd_dispatch/server/server.lua create mode 100644 modules/dispatch/tk_dispatch/client/client.lua create mode 100644 modules/dispatch/tk_dispatch/server/server.lua diff --git a/modules/dispatch/_default/client/client.lua b/modules/dispatch/_default/client/client.lua index ddb3718..881e1e8 100644 --- a/modules/dispatch/_default/client/client.lua +++ b/modules/dispatch/_default/client/client.lua @@ -23,29 +23,4 @@ RegisterNetEvent('community_bridge:Client:DispatchAlert', function(alert) local blip = Bridge.Utility.CreateBlip(alert.coords, alert.blipData.sprite, alert.blipData.color, alert.blipData.scale, alert.code, true) Wait(alert.time) Bridge.Utility.RemoveBlip(blip) -end) - ---[[ -RegisterCommand('testalert', function(source, args) - print('sending alert') - local ped = cache.ped - local vehicle = cache.vehicle - Dispatch.SendAlert({ - vehicle = vehicle or nil, - plate = vehicle and GetVehicleNumberPlateText(vehicle) or nil, - ped = ped, - pedCoords = ped and GetEntityCoords(ped), - coords = GetEntityCoords(ped), - blipData = { - sprite = 161, - color = 1, - scale = 0.8, - }, - message = "Vehicle is being stolen", - code = '10-80', - icon = 'fas fa-question', - jobs = {'police'}, - alertTime = 10 - }) -end, false) ---]] \ No newline at end of file +end) \ No newline at end of file diff --git a/modules/dispatch/cd_dispatch/client/client.lua b/modules/dispatch/cd_dispatch/client/client.lua new file mode 100644 index 0000000..b9e0aa2 --- /dev/null +++ b/modules/dispatch/cd_dispatch/client/client.lua @@ -0,0 +1,24 @@ +if GetResourceState('cd_dispatch') ~= 'started' then return end +Dispatch = Dispatch or {} + +Dispatch.SendAlert = function(data) + local plyrData = exports['cd_dispatch']:GetPlayerInfo() + TriggerServerEvent('cd_dispatch:AddNotification', { + job_table = data.jobs, + coords = data.coords, + title = data.message, + message = data.message, + flash = 0, + unique_id = plyrData.unique_id, + sound = 1, + blip = { + sprite = data.blipData.sprite, + scale = data.blipData.scale, + colour = data.blipData.color, + flashes = false, + text = data.message, + time = (data.time / 1000), + radius = 0, + } + }) +end \ No newline at end of file diff --git a/modules/dispatch/cd_dispatch/server/server.lua b/modules/dispatch/cd_dispatch/server/server.lua new file mode 100644 index 0000000..364e335 --- /dev/null +++ b/modules/dispatch/cd_dispatch/server/server.lua @@ -0,0 +1,2 @@ +if GetResourceState('cd_dispatch') ~= 'started' then return end +Dispatch = Dispatch or {} diff --git a/modules/dispatch/linden_outlawalert/client/client.lua b/modules/dispatch/linden_outlawalert/client/client.lua index 1d19ea2..3b936e0 100644 --- a/modules/dispatch/linden_outlawalert/client/client.lua +++ b/modules/dispatch/linden_outlawalert/client/client.lua @@ -8,7 +8,7 @@ Dispatch.SendAlert = function(data) description = data.message or "Alert", isImportant = 0, recipientList = data.jobs or {'police'}, - length = (data.alertTime * 1000) or '10000', + length = data.time or '10000', infoM = data.icon or 'fas fa-question', info = data.message or "Alert" }, diff --git a/modules/dispatch/tk_dispatch/client/client.lua b/modules/dispatch/tk_dispatch/client/client.lua new file mode 100644 index 0000000..7d112fb --- /dev/null +++ b/modules/dispatch/tk_dispatch/client/client.lua @@ -0,0 +1,20 @@ +if GetResourceState('tk_dispatch') ~= 'started' then return end +Dispatch = Dispatch or {} + +Dispatch.SendAlert = function(data) + exports.tk_dispatch:addCall({ + title = data.message, + code = data.code or '10-80', + priority = 'Priority 3', + coords = data.coords or GetEntityCoords(PlayerPedId()), + showLocation = true, + showGender = false, + playSound = true, + blip = { + color = data.blipData.color or 3, + sprite = data.blipData.sprite or 1, + scale = data.blipData.scale or 0.8, + }, + jobs = data.jobs or {'police'}, + }) +end \ No newline at end of file diff --git a/modules/dispatch/tk_dispatch/server/server.lua b/modules/dispatch/tk_dispatch/server/server.lua new file mode 100644 index 0000000..43020fb --- /dev/null +++ b/modules/dispatch/tk_dispatch/server/server.lua @@ -0,0 +1,2 @@ +if GetResourceState('tk_dispatch') ~= 'started' then return end +Dispatch = Dispatch or {} \ No newline at end of file