adding config locations

davefl67 · Jun 30, 2023 · 0312c0a · 0312c0a
1 parent be2aafe
commit 0312c0a
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 42 deletions.
diff --git a/client/aspects/cameras.lua b/client/aspects/cameras.lua
@@ -144,16 +144,17 @@ AddEventHandler('mifh:start:cameras', function(choice)
     end)
 end)
 
-RegisterCommand('bcam', function()
-    spawncameras()
-    spawncamerapad()
-
+RegisterCommand('bcam', function(choice)
+    choice = BK.debug
+    spawncameras(choice)
+    spawncamerapad(choice)
+
     Citizen.CreateThread(function()
         if not system then
             return nil
         else
-            spawncamerazoneoutside()
-            spawncamerazoneinside()
+            spawncamerazoneoutside(choice)
+            spawncamerazoneinside(choice)
         end
         Citizen.Wait(100)
     end)

diff --git a/client/aspects/manager.lua b/client/aspects/manager.lua
@@ -54,6 +54,7 @@ AddEventHandler('mifh:start:mngr', function(choice)
     spawnmanager(choice)
 end)
 
-RegisterCommand('mngr', function()
-    spawnmanager()
+RegisterCommand('mngr', function(choice)
+    choice = BK.debug
+    spawnmanager(choice)
 end, false)
diff --git a/client/aspects/moneycart.lua b/client/aspects/moneycart.lua
@@ -179,4 +179,11 @@ AddEventHandler('mifh:start:trollys', function(choice)
     spawntrolly1(choice)
     spawntrolly2(choice)
     spawntrolly3(choice)
-end)
+end)
+
+RegisterCommand('btly', function(choice)
+    choice = BK.debug
+    spawntrolly1(choice)
+    spawntrolly2(choice)
+    spawntrolly3(choice)
+end, false)
diff --git a/client/aspects/security.lua b/client/aspects/security.lua
@@ -9,15 +9,11 @@ local vaultmoving = false
 local function hackpad()
     if hacked == true then return end
     if not hacked then
-        local success = lib.skillCheck({'medium', 'medium', 'hard'}, {'q', 'w', 'e'})
+        local success = lib.skillCheck({'easy', 'easy', 'medium'}, {'q', 'w', 'e'})
         if success then 
             hacked = true
-            vaultmoving = true
-            TriggerEvent('openvault')
-            TriggerEvent('mifh:vault:trollys')
             Wait(20000)
             vaultmoving = false
-            vaultopen = true
         else
             hacked = false
             failed = true
@@ -51,14 +47,13 @@ local function spawnsecpadzone1(choice)
                 name = 'secpad_card1',
                 icon = 'fa-solid fa-id-card-clip',
                 label = 'Use keycard',
-                items = 'card_flcamnger',
+                items = BK.banks.key,
                 canInteract = function(_, distance)
                     return distance < 2.0 and not hacked
                 end,
                 onSelect = function()
                     vaultmoving = true
-                    TriggerEvent('openvault')
-                    TriggerEvent('mifh:vault:trollys')
+                    TriggerEvent('openvault', choice)
                     Wait(20000)
                     vaultmoving = false
                     vaultopen = true
@@ -74,8 +69,7 @@ local function spawnsecpadzone1(choice)
                 end,
                 onSelect = function()
                     vaultmoving = true
-                    TriggerEvent('openvault')
-                    TriggerEvent('mifh:vault:trollys')
+                    TriggerEvent('openvault', choice)
                     Wait(20000)
                     vaultmoving = false
                     vaultopen = true
@@ -90,7 +84,7 @@ local function spawnsecpadzone1(choice)
                 end,
                 onSelect = function()
                     vaultmoving = true
-                    TriggerEvent('closevault')
+                    TriggerEvent('closevault', choice)
                     Wait(20000)
                     vaultmoving = false
                     vaultopen = false
@@ -149,7 +143,8 @@ AddEventHandler('mifh:start:security', function(choice)
     spawnsecpadzone2(choice)
 end)
 
-RegisterCommand('bsec', function()
-    spawnsecpadzone1()
-    spawnsecpadzone2()
+RegisterCommand('bsec', function(choice)
+    choice = BK.debug
+    spawnsecpadzone1(choice)
+    spawnsecpadzone2(choice)
 end, false)
diff --git a/client/aspects/vault.lua b/client/aspects/vault.lua
@@ -12,6 +12,7 @@ local drillt = {
     obj = nil
 }
 
+
 local function spawnvaultzone(choice)
     local coords = choice.vaultdoor.loc
     local head = choice.vaultdoor.head
@@ -131,16 +132,7 @@ AddEventHandler('mifh:start:vault', function(choice)
     spawnvaultzone(choice)
 end)
 
-RegisterCommand('bvlt', function()
-    spawnvaultzone()
-end, false)
-
-RegisterCommand('bdoor1', function()
-    TriggerEvent('openvault')
-    Wait(1)
+RegisterCommand('bvlt', function(choice)
+    choice = BK.debug
+    spawnvaultzone(choice)
 end, false)
-
-RegisterCommand('bdoor2', function()
-    TriggerEvent('closevault')
-    Wait(1)
-end, false)
diff --git a/client/main.lua b/client/main.lua
@@ -6,7 +6,6 @@ FH.inprogress = false
 local bank = BK.banks
 
 local function heiststartloc()
-    local prog = FH.inprogress
     exports.ox_target:addBoxZone({
         coords = CG.start.loc,
         size = CG.start.size,
@@ -22,23 +21,25 @@ local function heiststartloc()
                 end,
                 onSelect = function()
                     lib.showContext('fleecaheist_menu')
-                    prog = true
+
                 end,
-            }
+            },
         }
 
     })
 end
 
+
 lib.registerContext({
     id = 'fleecaheist_menu',
     title = 'Darkweb: Fleeca Heist Plan',
     options = {
         {
-            title = 'Fleeca: 1',
-            description = 'Los Santos, Alta St',
+            title = 'Fleeca: location #1',
+            description = 'Los Santos, Alta St & Harwick Ave',
             icon = 'piggy-bank',
             onSelect = function()
+                FH.inprogress = true
                 FH.chosenbank = BK.banks.alta
                 TriggerEvent('mifh:start:cameras', FH.chosenbank)
                 TriggerEvent('mifh:start:mngr', FH.chosenbank)
@@ -47,6 +48,34 @@ lib.registerContext({
                 TriggerEvent('mifh:start:trollys', FH.chosenbank)
             end,
         },
+        {
+            title = 'Fleeca: location #2',
+            description = 'Los Santos, Mission Row & Straberry Ave',
+            icon = 'piggy-bank',
+            onSelect = function()
+                FH.inprogress = true
+                FH.chosenbank = BK.banks.legion
+                TriggerEvent('mifh:start:cameras', FH.chosenbank)
+                TriggerEvent('mifh:start:mngr', FH.chosenbank)
+                TriggerEvent('mifh:start:security', FH.chosenbank)
+                TriggerEvent('mifh:start:vault', FH.chosenbank)
+                TriggerEvent('mifh:start:trollys', FH.chosenbank)
+            end,
+        },
+        {
+            title = 'Fleeca: location #3',
+            description = 'Los Santos, Burton St & San Vitus Blvd',
+            icon = 'piggy-bank',
+            onSelect = function()
+                FH.inprogress = true
+                FH.chosenbank = BK.banks.legion
+                TriggerEvent('mifh:start:cameras', FH.chosenbank)
+                TriggerEvent('mifh:start:mngr', FH.chosenbank)
+                TriggerEvent('mifh:start:security', FH.chosenbank)
+                TriggerEvent('mifh:start:vault', FH.chosenbank)
+                TriggerEvent('mifh:start:trollys', FH.chosenbank)
+            end,
+        },
 
     }
   })

diff --git a/shared/banks.lua b/shared/banks.lua
@@ -10,8 +10,8 @@ option to open / close vault door with inside / outside pad
 
 ]]
 
-
 BK.banks  = {
+    key = 'phone',
     alta = {
         camera = vec4(271.758, -309.673, 57.025, 70.00),
         cameracontrol = vec4(276.055, -308.707, 49.864, 340.00),
@@ -60,5 +60,112 @@ BK.banks  = {
                 [3] = vec4(315.149, -287.406, 54.143, 70.666)
             },
         }
+    },
+
+    legion = {
+        camera = vec4(129.944, -1029.304, 32.879, 0.00),
+        cameracontrol = vec4(148.750, -1056.645, 29.197, 70.00),
+        camzoneoutside = {
+            loc = vec3(128.855, -1037.911, 29.433),
+            head = 160.00,
+            size = vec3(4, 10, 4),
+        },
+        camzoneinside = {
+            loc = vec3(144.257, -1041.662, 29.367),
+            head = 160,
+            size = vec3(2, 3, 3),
+        },
+        secsystemoutside = {
+            loc = vec3(146.721, -1046.367, 29.568),
+            head = 160.00,
+            size = vec3(0.5, 0.2, 0.6),
+        },
+        secsysteminside = {
+            loc = vec3(148.439, -1046.685, 29.568),
+            head = 160.00,
+            size = vec3(0.5, 0.2, 0.6),
+        },
+        vaultdoor = {
+            hash = 2121050683,
+            loc = vec3(148.626, -1045.363, 29.506),
+            head = 249.865,
+            size = vec3(2, 1.9, 2.5),
+            headend = 149.865, -- head - 100.00
+            drill = vec3(147.476, -1045.163, 29.506),
+            drillhead = 70.000
+        },
+        manager = {
+            ped = 'a_f_y_business_01',
+            anim = 'WORLD_HUMAN_DRINKING_FACILITY',
+            loc = {
+                [1] = vec4(130.697, -1036.227, 29.433, 75.925),
+                [2] = vec4(142.057, -1043.885, 29.368, 251.146),
+                [3] = vec4(142.057, -1043.885, 29.368, 251.146)
+            }
+        },
+        money = {
+            loc = {
+                [1] = vec4(151.130, -1046.527, 29.367, 69.95),
+                [2] = vec4(147.061, -1048.404, 29.367, 250.575),
+                [3] = vec4(149.094, -1049.866, 29.367, 204.148)
+            },
+        }
+    },
+
+    burton = {
+        camera = vec4(-378.329, -69.841, 48.292, 70.00),
+        cameracontrol = vec4(-340.777, -65.787, 54.585, 70.00),
+        camzoneoutside = {
+            loc = vec3(-365.577, -77.607, 45.661),
+            head = 251.50,
+            size = vec3(10.5, 20, 4),
+        },
+        camzoneinside = {
+            loc = vec3(-356.490, -50.442, 49.035),
+            head = 251.50,
+            size = vec3(2, 3, 3),
+        },
+        secsystemoutside = {
+            loc = vec3(-354.006, -55.598, 49.236),
+            head = 160.00,
+            size = vec3(0.5, 0.2, 0.6),
+        },
+        secsysteminside = {
+            loc = vec3(-352.282, -55.886, 49.236),
+            head = 160.00,
+            size = vec3(0.5, 0.2, 0.6),
+        },
+        vaultdoor = {
+            hash = 2121050683,
+            loc = vec3(-352.136, -54.572, 49.175),
+            head = 249.865,
+            size = vec3(2, 1.9, 2.5),
+            headend = 149.865, -- head - 100.00
+            drill = vec3(-353.336, -54.572, 49.175),
+            drillhead = 70.000
+        },
+        manager = {
+            ped = 'a_f_y_business_01',
+            anim = 'WORLD_HUMAN_DRINKING_FACILITY',
+            loc = {
+                [1] = vec4(-368.051, -71.355, 45.673, 167.081),
+                [2] = vec4(-350.230, -52.661, 49.036, 155.145),
+                [3] = vec4(-362.363, -38.153, 49.036, 158.509)
+            }
+        },
+        money = {
+            loc = {
+                [1] = vec4(151.130, -1046.527, 29.367, 69.95),
+                [2] = vec4(147.061, -1048.404, 29.367, 250.575),
+                [3] = vec4(149.094, -1049.866, 29.367, 204.148)
+            },
+        }
     }
-}
+}
+
+
+
+
+
+local loc = BK.banks
+BK.debug = loc.burton