diff --git a/client/main.lua b/client/main.lua index ae7cded..a7e82c2 100644 --- a/client/main.lua +++ b/client/main.lua @@ -57,8 +57,8 @@ function TakeOutVehicle(vehicleInfo) TriggerEvent("vehiclekeys:client:SetOwner", QBCore.Functions.GetPlate(veh)) SetVehicleEngineOn(veh, true, true) SetVehicleLivery(veh, 2) - if not Config.UseableItems then return end - TriggerServerEvent("inventory:server:addTrunkItems", QBCore.Functions.GetPlate(veh), Config.VehicleItems) + if not Config.UseableItems then return end + TriggerServerEvent("qb-newsjob:server:addVehicleItems", QBCore.Functions.GetPlate(veh)) end, vehicleInfo, coords, true) end diff --git a/config.lua b/config.lua index 067e3c6..6aab4dd 100644 --- a/config.lua +++ b/config.lua @@ -78,30 +78,15 @@ Config.VehicleItems = { name = "newscam", amount = 1, info = {}, - weight = 0.1, - type = "item", - image = "newscam.png", - label = "News Camera", - slot = 1, }, [2] = { name = "newsmic", amount = 1, info = {}, - weight = 0.1, - type = "item", - image = "newsmic.png", - label = "News Microphone", - slot = 2, }, [3] = { name = "newsbmic", amount = 1, info = {}, - weight = 0.1, - type = "item", - image = "newsbmic.png", - label = "Boom Microphone", - slot = 3, }, -} \ No newline at end of file +} diff --git a/server/main.lua b/server/main.lua index 5596207..dd1e8f1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,34 +1,57 @@ local QBCore = exports['qb-core']:GetCoreObject() -if Config.UseableItems then +RegisterNetEvent('qb-newsjob:server:addVehicleItems', function(plate) + local src = source + local Player = QBCore.Functions.GetPlayer(src) + if not Player or Player.PlayerData.job.name ~= 'reporter' then return end + if not exports['qb-vehiclekeys']:HasKeys(src, plate) then return end + + for slot, item in pairs(Config.VehicleItems) do + exports['qb-inventory']:AddItem('trunk-' .. plate, item.name, item.amount, slot, item.info, 'qb-newsjob:vehicleItems') + end +end) - QBCore.Functions.CreateUseableItem("newscam", function(source) - TriggerClientEvent("Cam:ToggleCam", source) +if Config.UseableItems then + QBCore.Functions.CreateUseableItem('newscam', function(source) + local Player = QBCore.Functions.GetPlayer(source) + if not Player or Player.PlayerData.job.name ~= 'reporter' then return end + + TriggerClientEvent('Cam:ToggleCam', source) end) - QBCore.Functions.CreateUseableItem("newsmic", function(source) - TriggerClientEvent("Mic:ToggleMic", source) + QBCore.Functions.CreateUseableItem('newsmic', function(source) + local Player = QBCore.Functions.GetPlayer(source) + if not Player or Player.PlayerData.job.name ~= 'reporter' then return end + + TriggerClientEvent('Mic:ToggleMic', source) end) - QBCore.Functions.CreateUseableItem("newsbmic", function(source) - TriggerClientEvent("Mic:ToggleBMic", source) + QBCore.Functions.CreateUseableItem('newsbmic', function(source) + local Player = QBCore.Functions.GetPlayer(source) + if not Player or Player.PlayerData.job.name ~= 'reporter' then return end + + TriggerClientEvent('Mic:ToggleBMic', source) end) else + QBCore.Commands.Add('newscam', 'Grab a news camera', {}, false, function(source, _) + local Player = QBCore.Functions.GetPlayer(source) + if not Player or Player.PlayerData.job.name ~= 'reporter' then return end - local Player = QBCore.Functions.GetPlayer(source) - QBCore.Commands.Add("newscam", "Grab a news camera", {}, false, function(source, _) - if Player.PlayerData.job.name ~= "reporter" then return end - TriggerClientEvent("Cam:ToggleCam", source) + TriggerClientEvent('Cam:ToggleCam', source) end) - QBCore.Commands.Add("newsmic", "Grab a news microphone", {}, false, function(source, _) - if Player.PlayerData.job.name ~= "reporter" then return end - TriggerClientEvent("Mic:ToggleMic", source) + QBCore.Commands.Add('newsmic', 'Grab a news microphone', {}, false, function(source, _) + local Player = QBCore.Functions.GetPlayer(source) + if not Player or Player.PlayerData.job.name ~= 'reporter' then return end + + TriggerClientEvent('Mic:ToggleMic', source) end) - QBCore.Commands.Add("newsbmic", "Grab a Boom microphone", {}, false, function(source, _) - if Player.PlayerData.job.name ~= "reporter" then return end - TriggerClientEvent("Mic:ToggleBMic", source) + QBCore.Commands.Add('newsbmic', 'Grab a Boom microphone', {}, false, function(source, _) + local Player = QBCore.Functions.GetPlayer(source) + if not Player or Player.PlayerData.job.name ~= 'reporter' then return end + + TriggerClientEvent('Mic:ToggleBMic', source) end) -end \ No newline at end of file +end