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
+22 -14
View File
@@ -1,5 +1,5 @@
--================================--
-- FIRE SCRIPT v1.6.9 --
-- FIRE SCRIPT v1.7.6 --
-- by GIMI (+ foregz, Albo1125) --
-- License: GNU GPL 3.0 --
--================================--
@@ -34,10 +34,12 @@ function Fire:removeFlame(fireIndex, flameIndex)
if not (fireIndex and flameIndex and self.active[fireIndex]) then
return
end
if self.active[fireIndex].flames[flameIndex] and self.active[fireIndex].flames[flameIndex] > -1 then
RemoveScriptFire(self.active[fireIndex].flames[flameIndex])
self.active[fireIndex].flames[flameIndex] = nil
end
if self.active[fireIndex].particles[flameIndex] and self.active[fireIndex].particles[flameIndex] ~= 0 then
local particles = self.active[fireIndex].particles[flameIndex]
Citizen.SetTimeout(
@@ -49,6 +51,7 @@ function Fire:removeFlame(fireIndex, flameIndex)
)
self.active[fireIndex].particles[flameIndex] = nil
end
if self.active[fireIndex].flameParticles[flameIndex] and self.active[fireIndex].flameParticles[flameIndex] ~= 0 then
local flameParticles = self.active[fireIndex].flameParticles[flameIndex]
Citizen.SetTimeout(
@@ -60,6 +63,7 @@ function Fire:removeFlame(fireIndex, flameIndex)
)
self.active[fireIndex].flameParticles[flameIndex] = nil
end
self.active[fireIndex].flameCoords[flameIndex] = nil
if self.active[fireIndex] ~= nil and countElements(self.active[fireIndex].flames) < 1 then
@@ -73,7 +77,7 @@ function Fire:remove(fireIndex, callback)
return
end
for k, v in pairs(self.active[fireIndex].flames) do
for k, v in pairs(self.active[fireIndex].flameCoords) do
self:removeFlame(fireIndex, k)
Citizen.Wait(20)
end
@@ -130,14 +134,16 @@ Citizen.CreateThread(
for fireIndex, v in pairs(Fire.active) do
if countElements(v.particles) ~= 0 then
for flameIndex, _v in pairs(v.particles) do
local isFirePresent = GetNumberOfFiresInRange(
v.flameCoords[flameIndex].x,
v.flameCoords[flameIndex].y,
v.flameCoords[flameIndex].z,
0.05
)
if isFirePresent == 0 then
TriggerServerEvent('fireManager:removeFlame', fireIndex, flameIndex)
if v.flameCoords[flameIndex] ~= nil then
local isFirePresent = GetNumberOfFiresInRange(
v.flameCoords[flameIndex].x,
v.flameCoords[flameIndex].y,
v.flameCoords[flameIndex].z,
0.05
)
if isFirePresent == 0 then
TriggerServerEvent('fireManager:removeFlame', fireIndex, flameIndex)
end
end
end
end
@@ -150,13 +156,14 @@ Citizen.CreateThread(
function()
while true do
local pedCoords = GetEntityCoords(GetPlayerPed(-1))
while syncInProgress do
Citizen.Wait(10)
end
for fireIndex, v in pairs(Fire.active) do
for flameIndex, coords in pairs(Fire.active[fireIndex].flameCoords) do
Citizen.Wait(10)
if not syncInProgress and Fire.active[fireIndex] and Fire.active[fireIndex].flameCoords[flameIndex] and not Fire.active[fireIndex].particles[flameIndex] and #(coords - pedCoords) < 300.0 then
while syncInProgress do
Citizen.Wait(10)
end
syncInProgress = true
if Fire.active[fireIndex] and Fire.active[fireIndex].flameCoords[flameIndex] and not Fire.active[fireIndex].particles[flameIndex] and #(coords - pedCoords) < 300.0 then
local z = coords.z
repeat
@@ -211,6 +218,7 @@ Citizen.CreateThread(
Fire.active[fireIndex].flames[flameIndex] = nil
end
end
syncInProgress = false
end
end
Citizen.Wait(1500)