From a41ac855f6e052f8ff6210e06adbb278b0eb18d3 Mon Sep 17 00:00:00 2001 From: Devo Date: Mon, 29 May 2023 11:27:30 -0400 Subject: [PATCH] Adds placeholder for Priority Status --- README.md | 1 + client.lua | 14 ++++++++++++++ server.lua | 1 + 3 files changed, 16 insertions(+) diff --git a/README.md b/README.md index 4840617..d9892ee 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,7 @@ Note: All Times are returned as Eastern Standard Time. {US_DAY} | Returns the current day. {US_MONTH} | Returns the current month. {US_YEAR} | Reutrns the current year. +{PRIO_STATUS} | Reutrns the current priority status (Requires [Badger-Priorities](https://github.com/JaredScar/Badger-Priorities)) {CURRENT_AOP} | Returns the current AOP. {PEACETIME_STATUS} | Returns the current peacetime status. diff --git a/client.lua b/client.lua index d755227..bc2789f 100644 --- a/client.lua +++ b/client.lua @@ -231,6 +231,17 @@ RegisterNetEvent('Badssentials:SetPT') AddEventHandler('Badssentials:SetPT', function(pt) peacetime = pt; end) +RegisterNetEvent('Badssentials:SetPrioStatus') +AddEventHandler('Badssentials:SetPrioStatus', function(prio) + if prio == "inProgress" then + prioStatus = "Priority in Progress" + elseif prio == "onHold" then + prioStatus = "Priorities are on Hold" + else + prioStatus = prio .. " mins"; + end +end) +prioStatus = "0 mins" displaysHidden = false; RegisterCommand(Config.Misc.ToggleHUDCommand, function() displaysHidden = not displaysHidden; @@ -335,6 +346,9 @@ Citizen.CreateThread(function() disp = disp:gsub("{US_MONTH}", currentMonth); disp = disp:gsub("{US_YEAR}", currentYear); disp = disp:gsub("{CURRENT_AOP}", currentAOP); + if (disp:find("{PRIO_STATUS}")) then + disp = disp:gsub("{PRIO_STATUS}", prioStatus); + end if (disp:find("{PEACETIME_STATUS}")) then if peacetime then disp = disp:gsub("{PEACETIME_STATUS}", "~g~Enabled") diff --git a/server.lua b/server.lua index baf42d2..37bdc20 100644 --- a/server.lua +++ b/server.lua @@ -66,6 +66,7 @@ Citizen.CreateThread(function() Wait(1000); TriggerClientEvent('Badssentials:SetAOP', -1, currentAOP); TriggerClientEvent('Badssentials:SetPT', -1, peacetime); + TriggerClientEvent('Badssentials:SetPrioStatus', -1, exports['Badger-Priorities'].GetPrioStatus()); local time = format_time(os.time(), "%H:%M"); local date = format_time(os.time(), "%m %d %Y"); local timeHour = split(time, ":")[1]