Safe Zone air vehicles whitelist, updated holograms and scripts.

+ Updated Safe-Zones to whitelist air vehicles from being stopped.
+ Latest version of wl_wars2x police radar.
+ Updated weapon restrictions.
+ Fire-Scripts updated to latest version.
This commit is contained in:
Jacob
2022-01-16 16:06:50 +00:00
parent 22824d5542
commit c39103e896
22 changed files with 548 additions and 141 deletions
+35 -17
View File
@@ -1,5 +1,5 @@
--================================--
-- FIRE SCRIPT v1.7.4 --
-- FIRE SCRIPT v1.7.6 --
-- by GIMI (+ foregz, Albo1125) --
-- License: GNU GPL 3.0 --
--================================--
@@ -8,7 +8,7 @@
-- VERSION CHECK --
--================================--
Version = "1.7.4"
Version = "1.7.6"
LatestVersionFeed = "https://api.github.com/repos/gimicze/firescript/releases/latest"
Citizen.CreateThread(
@@ -59,7 +59,7 @@ AddEventHandler(
RegisterNetEvent('fireManager:command:startfire')
AddEventHandler(
'fireManager:command:startfire',
function(coords, maxSpread, chance, triggerDispatch)
function(coords, maxSpread, chance, triggerDispatch, dispatchMessage)
if not Whitelist:isWhitelisted(source, "firescript.start") then
sendMessage(source, "Insufficient permissions.")
return
@@ -79,9 +79,13 @@ AddEventHandler(
Config.Dispatch.timeout,
function()
if Config.Dispatch.enabled and not Config.Dispatch.disableCalls then
Dispatch.expectingInfo[_source] = true
if dispatchMessage then
Dispatch:create(dispatchMessage, coords)
else
Dispatch.expectingInfo[_source] = true
TriggerClientEvent('fd:dispatch', _source, coords)
end
end
TriggerClientEvent('fd:dispatch', _source, coords)
end
)
end
@@ -353,21 +357,35 @@ RegisterCommand(
return
end
local identifier = GetPlayerIdentifier(serverId, 0)
if action == "scenario" then
if not Fire.registered[serverId] then
sendMessage(source, "The specified scenario hasn't been found.")
return
end
if not identifier then
sendMessage(source, "Player not online.")
return
end
table.remove(args, 1)
table.remove(args, 1)
if action == "add" then
Dispatch:subscribe(serverId, (not args[3] or args[3] ~= "false"))
sendMessage(source, ("Subscribed %s to dispatch."):format(GetPlayerName(serverId)))
elseif action == "remove" then
Dispatch:unsubscribe(serverId, identifier)
sendMessage(source, ("Unsubscribed %s from the dispatch."):format(GetPlayerName(serverId)))
Fire.registered[serverId].message = next(args) and table.concat(args, " ") or nil
Fire:saveRegistered()
sendMessage(source, ("Changed scenario's (#%s) dispatch message."):format(serverId))
else
sendMessage(source, "Invalid action.")
local identifier = GetPlayerIdentifier(serverId, 0)
if not identifier then
sendMessage(source, "Player not online.")
return
end
if action == "add" then
Dispatch:subscribe(serverId, (not args[3] or args[3] ~= "false"))
sendMessage(source, ("Subscribed %s to dispatch."):format(GetPlayerName(serverId)))
elseif action == "remove" then
Dispatch:unsubscribe(serverId, identifier)
sendMessage(source, ("Unsubscribed %s from the dispatch."):format(GetPlayerName(serverId)))
else
sendMessage(source, "Invalid action.")
end
end
end,
true