Update v4.2.1

* Added Support for msk_vehiclekeys

Author: Musiker15

VERSION

@@ -1 +1 @@
-4.2.0
+4.2.1

client/client_hotwire.lua

@@ -43,7 +43,7 @@ toggleLockpick = function()
 
 	if IsPedInAnyVehicle(playerPed, false) then return end	
 	if not IsAnyVehicleNearPoint(coords.x, coords.y, coords.z, 5.0) then return end
-
+	
 	local vehicle = GetClosestVehicle(coords.x, coords.y, coords.z, 3.0, 0, 71)
 	if not DoesEntityExist(vehicle) then return end
 	local plate = GetVehicleNumberPlateText(vehicle)
@@ -57,11 +57,15 @@ toggleLockpick = function()
 	elseif Config.Framework == 'QBCore' then
 		QBCore.Functions.TriggerCallback('msk_enginetoggle:getAlarmStage', function(owner, alarmStage)
             p:resolve({owner, alarmStage})
-        end)
+        end, plate)
 	else
 		-- Add your own code here
 	end
 
+	SetTimeout(5000, function()
+		p:resolve({nil, 'stage_1'})
+	end)
+
 	local cbResult = Citizen.Await(p)
 	local owner, stage = table.unpack(cbResult)
 	local alarmStage = Config.SafetyStages[stage]
@@ -71,15 +75,15 @@ toggleLockpick = function()
 		StartVehicleAlarm(vehicle)
 	end
 
-	if alarmStage.ownerAlert then
+	if alarmStage.ownerAlert and owner then
 		TriggerServerEvent('msk_enginetoggle:ownerAlert', GetEntityCoords(vehicle), owner)
 	end
 
 	if alarmStage.policeAlert then
 		TriggerServerEvent('msk_enginetoggle:policeAlert', GetEntityCoords(vehicle))
 	end
 
-	if alarmStage.liveCoords then
+	if alarmStage.liveCoords and owner then
 		TriggerServerEvent('msk_enginetoggle:liveCoords', owner, NetworkGetNetworkIdFromEntity(vehicle), GetEntityCoords(vehicle))
 	end
 
@@ -169,6 +173,7 @@ toggleLockpick = function()
 			if Config.VehicleKeys.enable and GetResourceState(Config.VehicleKeys.script) == "started" then
 				TriggerServerEvent('msk_enginetoggle:addTempKey', plate)
 			end
+			needToHotwire = false
 			Config.Notification(nil, Translation[Config.Locale]['hotwiring_foundkey'], 'success')
 		else
 			Config.Notification(nil, Translation[Config.Locale]['hotwiring_notfoundkey'], 'error')

client/client_vehiclekeys.lua

@@ -17,15 +17,15 @@ getKeyFromInventory = function(plate)
         local inventory = exports.ox_inventory:GetPlayerItems()
 
         for k, v in pairs(inventory) do
-            if v.name == InventoryItem and trim(v.metadata[Config.VehicleKeys.plate]) == trim(plate) then
+            if v.name == Config.VehicleKeys.item and trim(v.metadata[Config.VehicleKeys.plate]) == trim(plate) then
                 return true
             end
         end
     elseif getInventory() == 'qs-inventory' then
         local inventory = exports['qs-inventory']:getUserInventory()
 
         for k, v in pairs(inventory) do
-            if v.name == InventoryItem and trim(v.info[Config.VehicleKeys.plate]) == trim(plate) then
+            if v.name == Config.VehicleKeys.item and trim(v.info[Config.VehicleKeys.plate]) == trim(plate) then
                 return true
             end
         end
@@ -47,7 +47,7 @@ getKeyFromInventory = function(plate)
         local inventory = Citizen.Await(p)
 
         for k, v in pairs(inventory) do
-            if v.name == InventoryItem and trim(v.metadata[Config.VehicleKeys.plate]) == trim(plate) then
+            if v.name == Config.VehicleKeys.item and trim(v.metadata[Config.VehicleKeys.plate]) == trim(plate) then
                 return true
             end
         end
@@ -70,6 +70,8 @@ getIsKeyOwner = function(vehicle)
             isKeyOwner = exports["VehicleKeyChain"]:IsVehicleOrKeyOwner(vehicle)
         elseif Config.VehicleKeys.script == 'vehicle_keys' and (GetResourceState("vehicle_keys") == "started") then
             isKeyOwner = exports["vehicle_keys"]:doesPlayerOwnPlate(plate)
+        elseif Config.VehicleKeys.script == 'msk_vehiclekeys' and (GetResourceState("msk_vehiclekeys") == "started") then
+            isKeyOwner = exports["msk_vehiclekeys"]:HasPlayerKeyOrIsVehicleOwner(vehicle)
         else
             -- Add your own code here
         end

config.lua

@@ -40,14 +40,16 @@ Config.EngineOnAtEnter = false -- Set to true to toggle the engine automatically
 Config.EngineFromSecondSeat = false
 ----------------------------------------------------------------
 -- Vehicle Key System - set true then only the Owner of the Vehicle or someone with a Key can start the Engine
--- VehicleKeyChain: https://forum.cfx.re/t/release-vehicle-key-chain-v4-1-4-esx-qb/3319563
+
+-- msk_vehiclekeys: https://forum.cfx.re/t/esx-qbcore-msk-vehiclekeys-unique-items/5264475
 -- vehicle_keys: https://forum.cfx.re/t/esx-qbcore-vehicles-keys-vehicles-lock-remote-control-ui-and-much-more/4857274
+-- VehicleKeyChain: https://forum.cfx.re/t/release-vehicle-key-chain-v4-1-4-esx-qb/3319563
 
 Config.VehicleKeys = {
-    enable = false, -- Set true to enable this feature
+    enable = true, -- Set true to enable this feature
 
-    -- Supported Scripts: 'VehicleKeyChain', 'vehicle_keys', 'okokGarage'
-    script = 'VehicleKeyChain',
+    -- Supported Scripts: 'msk_vehiclekeys', 'VehicleKeyChain', 'vehicle_keys', 'okokGarage'
+    script = 'msk_vehiclekeys',
 
     -- This is for inventories with metadata like ox_inventory
     -- Supported Inventories: ox_inventory, qs-inventory, core_inventory
@@ -64,12 +66,10 @@ Config.SaveAngleOnExit = 75 -- default: F - 75 (Exit Vehicle)
 -- either exact plates or just a string that should be in the vehicles plate e.g. "ESX" will ignore te plate "ESX1234" too
 Config.Whitelist = {
     vehicles = {
-        -- "nero2",
-        -- "zentorno",
+        "caddy", "caddy2",
     },
     plates = {
-        -- "ESX",
-        -- "MSK",
+        "ESX", "MSK",
     },
 }
 ----------------------------------------------------------------
@@ -176,7 +176,7 @@ Config.Animation = {
     hotwire = { -- Animation for hotwire
         dict = 'veh@forklift@base',
         anim = 'hotwire',
-        action = 'skillbar', -- Set to 'skillbar' or 'progressbar'
-        time = 30, -- in seconds // How long does it take to hotwire the vehicle // Only for 'progressbar'
+        action = 'progressbar', -- Set to 'skillbar' or 'progressbar' // skillbar might cause the player to get out of the vehicle...
+        time = 15, -- in seconds // How long does it take to hotwire the vehicle // Only for 'progressbar'
     }
 }

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_enginetoggle'
 description 'EngineToggle for Vehicles'
-version '4.2.0'
+version '4.2.1'
 
 lua54 'yes'
 

server/server.lua

@@ -92,6 +92,8 @@ RegisterNetEvent('msk_enginetoggle:addTempKey', function(plate)
 		exports["VehicleKeyChain"]:AddTempKey(playerId, plate)
 	elseif Config.VehicleKeys.script == 'vehicle_keys' then
 		exports["vehicle_keys"]:giveVehicleKeysToPlayerId(playerId, plate, 'temporary')
+	elseif Config.VehicleKeys.script == 'msk_vehiclekeys' then
+		exports["msk_vehiclekeys"]:AddKey({source = playerId}, plate, 'temporary')
 	elseif Config.VehicleKeys.script == 'okokGarage' then
 		TriggerEvent("okokGarage:GiveKeys", plate, playerId)
 	else