refactor: whitespaces global variables and loops

client/anpr.lua

@@ -6,48 +6,49 @@ if not config.enableRadars then return end
 local speedCams = {}
 
 local function speedRange(speed)
-	speed = math.ceil(speed)
-	for k, v in pairs(sharedConfig.speedFines) do
-		if speed < v.maxSpeed then
-			TriggerServerEvent('police:server:Radar', k)
-			TriggerServerEvent('InteractSound_SV:PlayOnSource', 'speedcamera', 0.25)
-			break
-		end
-	end
+    speed = math.ceil(speed)
+    for i = 1, #sharedConfig.speedFines do
+        if speed < sharedConfig.speedFines[i].maxSpeed then
+            TriggerServerEvent('police:server:Radar', i)
+            TriggerServerEvent('InteractSound_SV:PlayOnSource', 'speedcamera', 0.25)
+            break
+        end
+    end
 end
 
 local function handleSpeedCam(speedCam, radar)
-	if not cache.vehicle or cache.seat ~= -1 or GetVehicleClass(cache.vehicle) == 18 then return end
-	local plate =  qbx.getVehiclePlate(cache.vehicle)
-	local speed = GetEntitySpeed(cache.vehicle) * (config.useMPH and 2.236936 or 3.6)
-	local overLimit = speed - speedCam.speed
-
-	lib.callback('police:server:isPlateFlagged', false, function(result)
-		if not result then return end
-		local s1, s2 = GetStreetNameAtCoord(speedCam.coords.x, speedCam.coords.y, speedCam.coords.z)
-		local street = GetStreetNameFromHashKey(s1)
-		local street2 = GetStreetNameFromHashKey(s2)
-		if street2 then
-			street = street .. ' | ' .. street2
-		end
-		TriggerServerEvent('police:server:FlaggedPlateTriggered', radar, plate, street)
-	end, plate)
-
-	if not sharedConfig.speedFines or overLimit < 0 then return end
-	speedRange(overLimit)
+    if not cache.vehicle or cache.seat ~= -1 or GetVehicleClass(cache.vehicle) == 18 then return end
+    local plate =  qbx.getVehiclePlate(cache.vehicle)
+    local speed = GetEntitySpeed(cache.vehicle) * (config.useMPH and 2.236936 or 3.6)
+    local overLimit = speed - speedCam.speed
+
+    lib.callback('police:server:isPlateFlagged', false, function(result)
+        if not result then return end
+        local s1, s2 = GetStreetNameAtCoord(speedCam.coords.x, speedCam.coords.y, speedCam.coords.z)
+        local street = GetStreetNameFromHashKey(s1)
+        local street2 = GetStreetNameFromHashKey(s2)
+        if street2 then
+            street = street .. ' | ' .. street2
+        end
+        TriggerServerEvent('police:server:FlaggedPlateTriggered', radar, plate, street)
+    end, plate)
+
+    if not sharedConfig.speedFines or overLimit < 0 then return end
+    speedRange(overLimit)
 end
 
 CreateThread(function()
-	for _, value in pairs(config.locations) do
-		speedCams[#speedCams + 1] = lib.points.new({
-			coords = value.coords.xyz,
-			distance = 20.0,
-			speed = value.speedlimit,
-		})
-	end
-	for k, v in pairs(speedCams) do
-		function v:onEnter()
-			handleSpeedCam(self, k)
-		end
-	end
+    for i = 1, #config.locations do
+        local point = lib.points.new({
+            coords = config.locations[i].coords,
+            distance = 20.0,
+            speed = config.locations[i].speedlimit,
+        })
+
+        speedCams[#speedCams + 1] = point
+
+        function point:onEnter()
+            handleSpeedCam(self, #speedCams)
+        end
+    end
 end)

client/camera.lua

@@ -118,23 +118,23 @@ end)
 
 RegisterNetEvent('police:client:DisableAllCameras', function()
     if GetInvokingResource() then return end
-    for k in pairs(config.cameras) do
-        config.cameras[k].isOnline = false
+    for i = 1, #config.cameras do
+        config.cameras[i].isOnline = false
     end
 end)
 
 RegisterNetEvent('police:client:EnableAllCameras', function()
     if GetInvokingResource() then return end
-    for k in pairs(config.cameras) do
-        config.cameras[k].isOnline = true
+    for i = 1, #config.cameras do
+        config.cameras[i].isOnline = true
     end
 end)
 
 RegisterNetEvent('police:client:SetCamera', function(key, isOnline)
     if GetInvokingResource() then return end
     if type(key) == 'table' and table.type(key) == 'array' then
-        for _, v in pairs(key) do
-            config.cameras[v].isOnline = isOnline
+        for i = 1, #key do
+            config.cameras[key[i]].isOnline = isOnline
         end
     elseif type(key) == 'number' then
         config.cameras[key].isOnline = isOnline

client/evidence.lua

@@ -166,7 +166,7 @@ RegisterNetEvent('evidence:client:ClearCasingsInArea', function()
 end)
 
 local function updateStatus()
-    if not IsLoggedIn then return end
+    if not LocalPlayer.state.isLoggedIn then return end
     if currentStatusList and next(currentStatusList) then
         for k in pairs(currentStatusList) do
             if currentStatusList[k].time > 0 then
@@ -295,7 +295,7 @@ CreateThread(function()
 end)
 
 local function canDiscoverEvidence()
-    return IsLoggedIn
+    return LocalPlayer.state.isLoggedIn
     and QBX.PlayerData.job.type == 'leo'
     and QBX.PlayerData.job.onduty
     and IsPlayerFreeAiming(cache.playerId)

client/heli.lua

@@ -200,7 +200,7 @@ local function turnOffCam()
 end
 
 local function handleInVehicle()
-    if not IsLoggedIn then return end
+    if not LocalPlayer.state.isLoggedIn then return end
     if QBX.PlayerData.job.type ~= 'leo' and not QBX.PlayerData.job.onduty then return end
     if isHeliHighEnough(cache.vehicle) then
         if IsControlJustPressed(0, toggleHeliCam) then -- Toggle Helicam

client/interactions.lua

@@ -1,5 +1,6 @@
 local config = require 'config.client'
 local isEscorting = false
+local cuffType = 1
 
 exports('IsHandcuffed', function()
     return QBX.PlayerData.metadata.ishandcuffed
@@ -91,8 +92,8 @@ local function handcuffedEscorted()
     local sleep = 1000
     local anim = {{dict = 'mp_arresting', anim = 'idle'}, {dict = 'mp_arrest_paired', anim = 'crook_p2_back_right'}}
 
-    if not IsLoggedIn then return sleep end
-    if isEscorted then
+    if not LocalPlayer.state.isLoggedIn then return sleep end
+    if IsEscorted then
         sleep = 0
         escortActions()
     end
@@ -115,16 +116,16 @@ RegisterNetEvent('police:client:SetOutVehicle', function()
 end)
 
 RegisterNetEvent('police:client:PutInVehicle', function()
-    if not QBX.PlayerData.metadata.ishandcuffed and not isEscorted then return end
+    if not QBX.PlayerData.metadata.ishandcuffed and not IsEscorted then return end
 
     local coords = GetEntityCoords(cache.ped)
     local vehicle = lib.getClosestVehicle(coords)
     if not DoesEntityExist(vehicle) then return end
 
     for i = GetVehicleMaxNumberOfPassengers(vehicle), 0, -1 do
         if IsVehicleSeatFree(vehicle, i) then
-            isEscorted = false
-            TriggerEvent('hospital:client:isEscorted', isEscorted)
+            IsEscorted = false
+            TriggerEvent('hospital:client:isEscorted', IsEscorted)
             ClearPedTasks(cache.ped)
             DetachEntity(cache.ped, true, false)
             Wait(100)
@@ -166,9 +167,13 @@ RegisterNetEvent('police:client:RobPlayer', function()
     local player, playerPed  = getClosestPlayer()
     if not player then return end
     local playerId = GetPlayerServerId(player)
-    if not (IsEntityPlayingAnim(playerPed, 'missminuteman_1ig_2', 'handsup_base', 3) or IsEntityPlayingAnim(playerPed, 'mp_arresting', 'idle', 3) or isTargetDead(playerId)) then
+    if not (IsEntityPlayingAnim(playerPed, 'missminuteman_1ig_2', 'handsup_base', 3)
+        or IsEntityPlayingAnim(playerPed, 'mp_arresting', 'idle', 3)
+        or isTargetDead(playerId))
+    then
         return exports.qbx_core:Notify(locale('error.no_rob'), 'error')
     end
+
     if lib.progressCircle({
         duration = math.random(5000, 7000),
         position = 'bottom',
@@ -235,7 +240,7 @@ local function triggerIfHandsFree(eventName)
     local player = getClosestPlayer()
     if not player then return end
     local playerId = GetPlayerServerId(player)
-    if QBX.PlayerData.metadata.ishandcuffed or isEscorted then return end
+    if QBX.PlayerData.metadata.ishandcuffed or IsEscorted then return end
     TriggerServerEvent(eventName, playerId)
 end
 
@@ -255,7 +260,7 @@ RegisterNetEvent('police:client:KidnapPlayer', function()
     local player = getClosestPlayer()
     if not player then return end
     local playerId = GetPlayerServerId(player)
-    if IsPedInAnyVehicle(GetPlayerPed(player), false) or QBX.PlayerData.metadata.ishandcuffed or isEscorted then return end
+    if IsPedInAnyVehicle(GetPlayerPed(player), false) or QBX.PlayerData.metadata.ishandcuffed or IsEscorted then return end
     TriggerServerEvent('police:server:KidnapPlayer', playerId)
 end)
 
@@ -289,39 +294,42 @@ end)
 RegisterNetEvent('police:client:GetEscorted', function(playerId)
     if not QBX.PlayerData.metadata.isdead and not QBX.PlayerData.metadata.ishandcuffed and not QBX.PlayerData.metadata.inlaststand then return end
 
-    if not isEscorted then
-        isEscorted = true
+    if not IsEscorted then
+        IsEscorted = true
         local dragger = GetPlayerPed(GetPlayerFromServerId(playerId))
         local offset = GetOffsetFromEntityInWorldCoords(dragger, 0.0, 0.45, 0.0)
         SetEntityCoords(cache.ped, offset.x, offset.y, offset.z, true, false, false, false)
         AttachEntityToEntity(cache.ped, dragger, 11816, 0.45, 0.45, 0.0, 0.0, 0.0, 0.0, false, false, false, false, 2, true)
     else
-        isEscorted = false
+        IsEscorted = false
         DetachEntity(cache.ped, true, false)
     end
-    TriggerEvent('hospital:client:isEscorted', isEscorted)
+    TriggerEvent('hospital:client:isEscorted', IsEscorted)
 end)
 
 RegisterNetEvent('police:client:DeEscort', function()
-    isEscorted = false
-    TriggerEvent('hospital:client:isEscorted', isEscorted)
+    IsEscorted = false
+    TriggerEvent('hospital:client:isEscorted', IsEscorted)
     DetachEntity(cache.ped, true, false)
 end)
 
 RegisterNetEvent('police:client:GetKidnappedTarget', function(playerId)
-    if QBX.PlayerData.metadata.isdead or QBX.PlayerData.metadata.inlaststand or QBX.PlayerData.metadata.ishandcuffed then
-        if not isEscorted then
-            isEscorted = true
+    if     QBX.PlayerData.metadata.isdead
+        or QBX.PlayerData.metadata.ishandcuffed
+        or QBX.PlayerData.metadata.inlaststand
+    then
+        if not IsEscorted then
+            IsEscorted = true
             local dragger = GetPlayerPed(GetPlayerFromServerId(playerId))
             lib.requestAnimDict('nm')
             AttachEntityToEntity(cache.ped, dragger, 0, 0.27, 0.15, 0.63, 0.5, 0.5, 0.0, false, false, false, false, 2, false)
             TaskPlayAnim(cache.ped, 'nm', 'firemans_carry', 8.0, -8.0, 100000, 33, 0, false, false, false)
         else
-            isEscorted = false
+            IsEscorted = false
             DetachEntity(cache.ped, true, false)
             ClearPedTasksImmediately(cache.ped)
         end
-        TriggerEvent('hospital:client:isEscorted', isEscorted)
+        TriggerEvent('hospital:client:isEscorted', IsEscorted)
     end
 end)
 
@@ -355,8 +363,8 @@ RegisterNetEvent('police:client:GetCuffed', function(playerId, isSoftcuff)
         end
         getCuffedAnimation(playerId)
     else
-        isEscorted = false
-        TriggerEvent('hospital:client:isEscorted', isEscorted)
+        IsEscorted = false
+        TriggerEvent('hospital:client:isEscorted', IsEscorted)
         DetachEntity(cache.ped, true, false)
         TriggerServerEvent('police:server:SetHandcuffStatus', false)
         ClearPedTasksImmediately(cache.ped)