fixes: registers/safes locations according to cams, default/gabz loca…

…tions, chance of notify, markedbills metadata
Qbox-project · Aug 3, 2023 · e5020ba · e5020ba
1 parent d43d393
commit e5020ba
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 154 deletions.
diff --git a/client.lua b/client.lua
@@ -1,9 +1,9 @@
 local QBCore = exports['qbx-core']:GetCoreObject()
-local IsUsingAdvanced
-local OpeningRegister
-local OpenRegisterDict = 'veh@break_in@0h@p_m_one@'
-local OpenRegisterAnim = 'low_force_entry_ds'
-local CurrentCombination
+local isUsingAdvanced
+local openingRegister
+local openRegisterDict = 'veh@break_in@0h@p_m_one@'
+local openRegisterAnim = 'low_force_entry_ds'
+local currentCombination
 
 local function StartLockpick(bool)
     SetNuiFocus(bool, bool)
@@ -17,19 +17,19 @@ end
 local function LoadAnimDict(dict) while not HasAnimDictLoaded(dict) do RequestAnimDict(dict) Wait(0) end end
 
 local function OpeningRegisterHandler(LockpickTime)
-    OpeningRegister = true
-    LoadAnimDict(OpenRegisterDict)
-    TaskPlayAnim(cache.ped, OpenRegisterDict, OpenRegisterAnim, 3.0, 3.0, -1, 16, 0, false, false, false)
+    openingRegister = true
+    LoadAnimDict(openRegisterDict)
+    TaskPlayAnim(cache.ped, openRegisterDict, openRegisterAnim, 3.0, 3.0, -1, 16, 0, false, false, false)
     CreateThread(function()
-        while OpeningRegister do
-            TaskPlayAnim(cache.ped, OpenRegisterDict, OpenRegisterAnim, 3.0, 3.0, -1, 16, 0, false, false, false)
+        while openingRegister do
+            TaskPlayAnim(cache.ped, openRegisterDict, openRegisterAnim, 3.0, 3.0, -1, 16, 0, false, false, false)
             Wait(2000)
             LockpickTime = LockpickTime - 2000
             TriggerServerEvent('qb-storerobbery:server:openregister', false)
             TriggerServerEvent('hud:server:GainStress', math.random(1, 3))
             if LockpickTime <= 0 then
-                OpeningRegister = false
-                StopAnimTask(cache.ped, OpenRegisterDict, OpenRegisterAnim, 1.0)
+                openingRegister = false
+                StopAnimTask(cache.ped, openRegisterDict, openRegisterAnim, 1.0)
             end
         end
     end)
@@ -56,6 +56,14 @@ local function DrawText3D(coords, text)
     ClearDrawOrigin()
 end
 
+lib.callback.register('qbx-storerobbery:client:GetCurrentTime', function()
+    local chance = Config.PoliceAlertChance
+    if GetClockHours() >= 1 and GetClockHours() <= 6 then
+        chance = Config.PoliceNightAlertChance
+    end
+    return chance
+end)
+
 CreateThread(function()
     local HasShownText
     while true do
@@ -110,7 +118,7 @@ CreateThread(function()
 end)
 
 RegisterNetEvent('qb-storerobbery:client:startRegister', function(IsAdvanced)
-    IsUsingAdvanced = IsAdvanced
+    isUsingAdvanced = IsAdvanced
     StartLockpick(true)
 end)
 
@@ -123,10 +131,10 @@ RegisterNUICallback('success', function(_, cb)
         disableMouse = false,
         disableCombat = true,
     }, {}, {}, {}, function() -- Done
-        OpeningRegister = false
+        openingRegister = false
         TriggerServerEvent('qb-storerobbery:server:openregister', true)
     end, function() -- Cancel
-        OpeningRegister = false
+        openingRegister = false
         TriggerServerEvent('qb-storerobbery:server:cancelledregister')
         QBCore.Functions.Notify(Lang:t('error.process_canceled'), 'error')
     end)
@@ -136,10 +144,10 @@ end)
 RegisterNUICallback('fail', function(_, cb)
     StartLockpick(false)
     if not QBCore.Functions.IsWearingGloves() then
-        local FingerDropChance = IsUsingAdvanced and math.random(0, 30) or math.random(0, 60)
+        local FingerDropChance = isUsingAdvanced and math.random(0, 30) or math.random(0, 60)
         if FingerDropChance > math.random(0, 100) then TriggerServerEvent('evidence:server:CreateFingerDrop', GetEntityCoords(cache.ped)) end
     end
-    TriggerServerEvent('qb-storerobbery:server:failedregister', IsUsingAdvanced)
+    TriggerServerEvent('qb-storerobbery:server:failedregister', isUsingAdvanced)
     cb('ok')
 end)
 
@@ -155,14 +163,14 @@ RegisterNetEvent('qb-storerobbery:client:syncconfig', function(Registers, Safes)
 end)
 
 RegisterNetEvent('qb-storerobbery:client:trysafe', function(ClosestSafeIndex, Combination)
-    CurrentCombination = Combination
+    currentCombination = Combination
     if Config.Safes[ClosestSafeIndex].type == 'keypad' then
         SendNUIMessage({
             action = 'openKeypad',
         })
         SetNuiFocus(true, true)
     else
-        TriggerEvent('SafeCracker:StartMinigame', CurrentCombination)
+        TriggerEvent('SafeCracker:StartMinigame', currentCombination)
     end
 end)
 
@@ -190,7 +198,7 @@ end)
 
 RegisterNUICallback('TryCombination', function(data, cb)
     SetNuiFocus(false, false)
-    if tonumber(data.combination) == CurrentCombination then
+    if tonumber(data.combination) == currentCombination then
         TriggerServerEvent('qb-storerobbery:server:successsafe')
         SendNUIMessage({
             action = "closeKeypad",

diff --git a/configs/default.lua b/configs/default.lua
@@ -36,68 +36,65 @@ Config.SafeRefresh = {
 
 Config.MinimumCops = 2
 Config.NotEnoughCopsNotify = true
-Config.CallCopsTimeout = 240000
+Config.CallCopsTimeout = 240000 -- in ms
+Config.PoliceAlertChance = 0.70 -- Chance of alerting police during the day
+Config.PoliceNightAlertChance = 0.40 -- Chance of alerting police at night (times:01-06)
 Config.UseDrawText = false
 
 Config.Registers = {
-    [1] = { coords = vector3(-47.24, -1757.65, 29.53), robbed = false, time = 0, safeKey = 1, camId = 4 },
-    [2] = { coords = vector3(-48.58, -1759.21, 29.59), robbed = false, time = 0, safeKey = 1, camId = 4 },
-    [3] = { coords = vector3(-1486.26, -378.0, 40.16), robbed = false, time = 0, safeKey = 2, camId = 5 },
-    [4] = { coords = vector3(-1222.03, -908.32, 12.32), robbed = false, time = 0, safeKey = 3, camId = 6 },
-    [5] = { coords = vector3(-706.08, -915.42, 19.21), robbed = false, time = 0, safeKey = 4, camId = 7 },
-    [6] = { coords = vector3(-706.16, -913.5, 19.21), robbed = false, time = 0, safeKey = 4, camId = 7 },
-    [7] = { coords = vector3(24.47, -1344.99, 29.49), robbed = false, time = 0, safeKey = 5, camId = 8 },
-    [8] = { coords = vector3(24.45, -1347.37, 29.49), robbed = false, time = 0, safeKey = 5, camId = 8 },
-    [9] = { coords = vector3(1134.15, -982.53, 46.41), robbed = false, time = 0, safeKey = 6, camId = 9 },
-    [10] = { coords = vector3(1165.05, -324.49, 69.2), robbed = false, time = 0, safeKey = 7, camId = 10 },
-    [11] = { coords = vector3(1164.7, -322.58, 69.2), robbed = false, time = 0, safeKey = 7, camId = 10 },
-    [12] = { coords = vector3(373.14, 328.62, 103.56), robbed = false, time = 0, safeKey = 8, camId = 11 },
-    [13] = { coords = vector3(372.57, 326.42, 103.56), robbed = false, time = 0, safeKey = 8, camId = 11 },
-    [14] = { coords = vector3(-1818.9, 792.9, 138.08), robbed = false, time = 0, safeKey = 9, camId = 12 },
-    [15] = { coords = vector3(-1820.17, 794.28, 138.08), robbed = false, time = 0, safeKey = 9, camId = 12 },
-    [16] = { coords = vector3(-2966.46, 390.89, 15.04), robbed = false, time = 0, safeKey = 10, camId = 13 },
-    [17] = { coords = vector3(-3041.14, 583.87, 7.9), robbed = false, time = 0, safeKey = 11, camId = 14 },
-    [18] = { coords = vector3(-3038.92, 584.5, 7.9), robbed = false, time = 0, safeKey = 11, camId = 14 },
-    [19] = { coords = vector3(-3244.56, 1000.14, 12.83), robbed = false, time = 0, safeKey = 12, camId = 15 },
-    [20] = { coords = vector3(-3242.24, 999.98, 12.83), robbed = false, time = 0, safeKey = 12, camId = 15 },
-    [21] = { coords = vector3(549.42, 2669.06, 42.15), robbed = false, time = 0, safeKey = 13, camId = 16 },
-    [22] = { coords = vector3(549.05, 2671.39, 42.15), robbed = false, time = 0, safeKey = 13, camId = 16 },
-    [23] = { coords = vector3(1165.9, 2710.81, 38.15), robbed = false, time = 0, safeKey = 14, camId = 17 },
-    [24] = { coords = vector3(2676.02, 3280.52, 55.24), robbed = false, time = 0, safeKey = 15, camId = 18 },
-    [25] = { coords = vector3(2678.07, 3279.39, 55.24), robbed = false, time = 0, safeKey = 15, camId = 18 },
-    [26] = { coords = vector3(1958.96, 3741.98, 32.34), robbed = false, time = 0, safeKey = 16, camId = 19 },
-    [27] = { coords = vector3(1960.13, 3740.0, 32.34), robbed = false, time = 0, safeKey = 16, camId = 19 },
-    [28] = { coords = vector3(1728.86, 6417.26, 35.03), robbed = false, time = 0, safeKey = 17, camId = 20 },
-    [29] = { coords = vector3(1727.85, 6415.14, 35.03), robbed = false, time = 0, safeKey = 17, camId = 20 },
-    [30] = { coords = vector3(-161.07, 6321.23, 31.5), robbed = false, time = 0, safeKey = 18, camId = 27 },
-    [31] = { coords = vector3(160.52, 6641.74, 31.6), robbed = false, time = 0, safeKey = 19, camId = 28 },
-    [32] = { coords = vector3(162.16, 6643.22, 31.6), robbed = false, time = 0, safeKey = 19, camId = 29 },
-    [33] = { coords = vector3(1696.67, 4924.37, 42.06), robbed = false, time = 0, safeKey = 20, camId = 35 },
-    [34] = { coords = vector3(1698.28, 4923.32, 42.06), robbed = false, time = 0, safeKey = 20, camId = 35 },
-    [35] = { coords = vector3(2554.86, 381.21, 108.62), robbed = false, time = 0, safeKey = 21, camId = 36 },
-    [36] = { coords = vector3(2557.23, 381.23, 108.62), robbed = false, time = 0, safeKey = 21, camId = 36 },
+    [1] = { coords = vec3(-706.08, -915.42, 19.21), robbed = false, time = 0, safeKey = 1, camId = 1 },
+    [2] = { coords = vec3(-706.16, -913.5, 19.21), robbed = false, time = 0, safeKey = 1, camId = 1 },
+    [3] = { coords = vec3(24.47, -1344.99, 29.49), robbed = false, time = 0, safeKey = 2, camId = 3 },
+    [4] = { coords = vec3(24.45, -1347.37, 29.49), robbed = false, time = 0, safeKey = 2, camId = 3 },
+    [5] = { coords = vec3(-47.24, -1757.65, 29.53), robbed = false, time = 0, safeKey = 3, camId = 5 },
+    [6] = { coords = vec3(-48.58, -1759.21, 29.59), robbed = false, time = 0, safeKey = 3, camId = 5 },
+    [7] = { coords = vec3(1165.05, -324.49, 69.2), robbed = false, time = 0, safeKey = 4, camId = 7 },
+    [8] = { coords = vec3(1164.7, -322.58, 69.2), robbed = false, time = 0, safeKey = 4, camId = 7 },
+    [9] = { coords = vec3(373.14, 328.62, 103.56), robbed = false, time = 0, safeKey = 5, camId = 9 },
+    [10] = { coords = vec3(372.57, 326.42, 103.56), robbed = false, time = 0, safeKey = 5, camId = 9 },
+    [11] = { coords = vec3(-1818.9, 792.9, 138.08), robbed = false, time = 0, safeKey = 6, camId = 11 },
+    [12] = { coords = vec3(-1820.17, 794.28, 138.08), robbed = false, time = 0, safeKey = 6, camId = 11 },
+    [13] = { coords = vec3(2554.86, 381.21, 108.62), robbed = false, time = 0, safeKey = 7, camId = 13 },
+    [14] = { coords = vec3(2557.23, 381.23, 108.62), robbed = false, time = 0, safeKey = 7, camId = 13 },
+    [15] = { coords = vec3(2676.02, 3280.52, 55.24), robbed = false, time = 0, safeKey = 8, camId = 15 },
+    [16] = { coords = vec3(2678.07, 3279.39, 55.24), robbed = false, time = 0, safeKey = 8, camId = 15 },
+    [17] = { coords = vec3(1958.96, 3741.98, 32.34), robbed = false, time = 0, safeKey = 9, camId = 17 },
+    [18] = { coords = vec3(1960.13, 3740.0, 32.34), robbed = false, time = 0, safeKey = 9, camId = 17 },
+    [19] = { coords = vec3(549.42, 2669.06, 42.15), robbed = false, time = 0, safeKey = 10, camId = 19 },
+    [20] = { coords = vec3(549.05, 2671.39, 42.15), robbed = false, time = 0, safeKey = 10, camId = 19 },
+    [21] = { coords = vec3(1728.86, 6417.26, 35.03), robbed = false, time = 0, safeKey = 11, camId = 21 },
+    [22] = { coords = vec3(1727.85, 6415.14, 35.03), robbed = false, time = 0, safeKey = 11, camId = 21 },
+    [23] = { coords = vec3(1696.67, 4924.37, 42.06), robbed = false, time = 0, safeKey = 12, camId = 23 },
+    [24] = { coords = vec3(1698.28, 4923.32, 42.06), robbed = false, time = 0, safeKey = 12, camId = 23 },
+    [25] = { coords = vec3(-3244.56, 1000.14, 12.83), robbed = false, time = 0, safeKey = 13, camId = 25 },
+    [26] = { coords = vec3(-3242.24, 999.98, 12.83), robbed = false, time = 0, safeKey = 13, camId = 25 },
+    [27] = { coords = vec3(-3041.14, 583.87, 7.9), robbed = false, time = 0, safeKey = 14, camId = 27 },
+    [28] = { coords = vec3(-3038.92, 584.5, 7.9), robbed = false, time = 0, safeKey = 14, camId = 27 },
+    [29] = { coords = vec3(-1222.03, -908.32, 12.32), robbed = false, time = 0, safeKey = 16, camId = 29 },
+    [30] = { coords = vec3(-1486.26, -378.0, 40.16), robbed = false, time = 0, safeKey = 17, camId = 30 },
+    [31] = { coords = vec3(1134.15, -982.53, 46.41), robbed = false, time = 0, safeKey = 18, camId = 31 },
+    [32] = { coords = vec3(1165.9, 2710.81, 38.15), robbed = false, time = 0, safeKey = 19, camId = 32 },
+    [33] = { coords = vec3(-2966.46, 390.89, 15.04), robbed = false, time = 0, safeKey = 21, camId = 33 },
 }
 
 Config.Safes = {
-    [1] = { coords = vector3(-43.43, -1748.3, 29.42), type = "keypad", robbed = false, camId = 4 },
-    [2] = { coords = vector3(-1478.94, -375.5, 39.16), type = "padlock", robbed = false, camId = 5 },
-    [3] = { coords = vector3(-1220.85, -916.05, 11.329), type = "padlock", robbed = false, camId = 6 },
-    [4] = { coords = vector3(-709.74, -904.15, 19.21), type = "keypad", robbed = false, camId = 7 },
-    [5] = { coords = vector3(28.21, -1339.14, 29.49), type = "keypad", robbed = false, camId = 8 },
-    [6] = { coords = vector3(1126.77, -980.1, 45.41), type = "padlock", robbed = false, camId = 9 },
-    [7] = { coords = vector3(1159.46, -314.05, 69.2), type = "keypad", robbed = false, camId = 10 },
-    [8] = { coords = vector3(378.17, 333.44, 103.56), type = "keypad", robbed = false, camId = 11 },
-    [9] = { coords = vector3(-1829.27, 798.76, 138.19), type = "keypad", robbed = false, camId = 12 },
-    [10] = { coords = vector3(-2959.64, 387.08, 14.04), type = "padlock", robbed = false, camId = 13 },
-    [11] = { coords = vector3(-3047.88, 585.61, 7.9), type = "keypad", robbed = false, camId = 14 },
-    [12] = { coords = vector3(-3250.02, 1004.43, 12.83), type = "keypad", robbed = false, camId = 15 },
-    [13] = { coords = vector3(546.41, 2662.8, 42.15), type = "keypad", robbed = false, camId = 16 },
-    [14] = { coords = vector3(1169.31, 2717.79, 37.15), type = "padlock", robbed = false, camId = 17 },
-    [15] = { coords = vector3(2672.69, 3286.63, 55.24), type = "keypad", robbed = false, camId = 18 },
-    [16] = { coords = vector3(1959.26, 3748.92, 32.34), type = "keypad", robbed = false, camId = 19 },
-    [17] = { coords = vector3(1734.78, 6420.84, 35.03), type = "keypad", robbed = false, camId = 20 },
-    [18] = { coords = vector3(-168.40, 6318.80, 30.58), type = "padlock", robbed = false, camId = 27 },
-    [19] = { coords = vector3(168.95, 6644.74, 31.70), type = "keypad", robbed = false, camId = 30 },
-    [20] = { coords = vector3(1707.9, 4920.49, 42.06), type = "keypad", robbed = false, camId = 35 },
-    [21] = { coords = vector3(2549.19, 384.83, 108.62), type = "keypad", robbed = false, camId = 36 },
+    [1] = { coords = vec3(-709.74, -904.15, 19.21), type = "keypad", robbed = false, camId = 2 },
+    [2] = { coords = vec3(31.19, -1339.27, 29.5), type = "keypad", robbed = false, camId = 4 },
+    [3] = { coords = vec3(28.15, -1339.23, 29.5), type = "keypad", robbed = false, camId = 6 },
+    [4] = { coords = vec3(1159.46, -314.05, 69.2), type = "keypad", robbed = false, camId = 8 },
+    [5] = { coords = vec3(378.11, 333.36, 103.57), type = "keypad", robbed = false, camId = 10 },
+    [6] = { coords = vec3(-1829.27, 798.76, 138.19), type = "keypad", robbed = false, camId = 12 },
+    [7] = { coords = vec3(2549.33, 384.88, 108.62), type = "keypad", robbed = false, camId = 14 },
+    [8] = { coords = vec3(2672.69, 3286.63, 55.24), type = "keypad", robbed = false, camId = 16 },
+    [9] = { coords = vec3(1959.21, 3748.83, 32.34), type = "keypad", robbed = false, camId = 18 },
+    [10] = { coords = vec3(546.56, 2662.8, 42.16), type = "keypad", robbed = false, camId = 20 },
+    [11] = { coords = vec3(1734.74, 6420.83, 35.04), type = "keypad", robbed = false, camId = 22 },
+    [12] = { coords = vec3(1707.9, 4920.49, 42.06), type = "keypad", robbed = false, camId = 24 },
+    [13] = { coords = vec3(-3250.09, 1004.46, 12.83), type = "keypad", robbed = false, camId = 26 },
+    [14] = { coords = vec3(-3047.88, 585.64, 7.91), type = "keypad", robbed = false, camId = 28 },
+    [15] = { coords = vec3(-1220.85, -916.05, 11.329), type = "padlock", robbed = false, camId = 31 },
+    [16] = { coords = vec3(-1478.94, -375.5, 39.16), type = "padlock", robbed = false, camId = 32 },
+    [17] = { coords = vec3(1126.77, -980.1, 45.41), type = "padlock", robbed = false, camId = 33 },
+    [18] = { coords = vec3(1169.31, 2717.79, 37.15), type = "padlock", robbed = false, camId = 34 },
+    [19] = { coords = vec3(-2959.64, 387.08, 14.04), type = "padlock", robbed = false, camId = 36 },
 }