diff --git a/server/functions.lua b/server/functions.lua index 1334c99..8dad406 100644 --- a/server/functions.lua +++ b/server/functions.lua @@ -185,7 +185,7 @@ function PaycheckLoop() local Players = QBCore.Functions.GetQBPlayers() for _, Player in pairs(Players) do local payment = Player.PlayerData.job.payment - if Player.PlayerData.job and Player.PlayerData.job.onduty and payment > 0 then + if Player.PlayerData.job and payment > 0 and (QBShared.Jobs[Player.PlayerData.job.name].offDutyPay or Player.PlayerData.job.onduty) then Player.Functions.AddMoney('bank', payment) TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, ('You received your paycheck of $%s'):format(payment)) end diff --git a/shared.lua b/shared.lua index 2a9961c..03307a7 100644 --- a/shared.lua +++ b/shared.lua @@ -694,6 +694,7 @@ QBShared.Jobs = { ['unemployed'] = { label = 'Civilian', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Freelancer', @@ -704,6 +705,7 @@ QBShared.Jobs = { ['police'] = { label = 'Law Enforcement', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Recruit', @@ -731,6 +733,7 @@ QBShared.Jobs = { ['ambulance'] = { label = 'EMS', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Recruit', @@ -758,6 +761,7 @@ QBShared.Jobs = { ['realestate'] = { label = 'Real Estate', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Recruit', @@ -785,6 +789,7 @@ QBShared.Jobs = { ['taxi'] = { label = 'Taxi', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Recruit', @@ -812,6 +817,7 @@ QBShared.Jobs = { ['bus'] = { label = 'Bus', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Driver', @@ -822,6 +828,7 @@ QBShared.Jobs = { ['cardealer'] = { label = 'Vehicle Dealer', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Recruit', @@ -849,6 +856,7 @@ QBShared.Jobs = { ['mechanic'] = { label = 'Mechanic', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Recruit', @@ -876,6 +884,7 @@ QBShared.Jobs = { ['judge'] = { label = 'Honorary', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Judge', @@ -886,6 +895,7 @@ QBShared.Jobs = { ['lawyer'] = { label = 'Law Firm', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Associate', @@ -896,6 +906,7 @@ QBShared.Jobs = { ['reporter'] = { label = 'Reporter', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Journalist', @@ -906,6 +917,7 @@ QBShared.Jobs = { ['trucker'] = { label = 'Trucker', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Driver', @@ -916,6 +928,7 @@ QBShared.Jobs = { ['tow'] = { label = 'Towing', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Driver', @@ -926,6 +939,7 @@ QBShared.Jobs = { ['garbage'] = { label = 'Garbage', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Collector', @@ -936,6 +950,7 @@ QBShared.Jobs = { ['vineyard'] = { label = 'Vineyard', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Picker', @@ -946,6 +961,7 @@ QBShared.Jobs = { ['hotdog'] = { label = 'Hotdog', defaultDuty = true, + offDutyPay = false, grades = { ['0'] = { name = 'Sales',