Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Fix: Add items to vehicle, More checks #26

Merged
merged 3 commits into from
May 27, 2024
Merged

🐛 Fix: Add items to vehicle, More checks #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aebd700
Fix: Add items to vehicle, More checks, Formatting
Qwerty1Verified May 27, 2024
573f3f0
Refactor: Remove unused config variables
Qwerty1Verified May 27, 2024
bd304d9
Fix: Add items to vehicle
Qwerty1Verified May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 1 addition & 16 deletions config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}
}
59 changes: 41 additions & 18 deletions server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
end
Loading