Merge pull request #375 from GameMango36/main

feat(paychecks): Jobs Off Duty Payment Option
This commit is contained in:
Kakarot
2021-12-19 20:07:40 -06:00
committed by GitHub
2 changed files with 17 additions and 1 deletions
+1 -1
View File
@@ -185,7 +185,7 @@ function PaycheckLoop()
local Players = QBCore.Functions.GetQBPlayers() local Players = QBCore.Functions.GetQBPlayers()
for _, Player in pairs(Players) do for _, Player in pairs(Players) do
local payment = Player.PlayerData.job.payment 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) Player.Functions.AddMoney('bank', payment)
TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, ('You received your paycheck of $%s'):format(payment)) TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, ('You received your paycheck of $%s'):format(payment))
end end
+16
View File
@@ -694,6 +694,7 @@ QBShared.Jobs = {
['unemployed'] = { ['unemployed'] = {
label = 'Civilian', label = 'Civilian',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Freelancer', name = 'Freelancer',
@@ -704,6 +705,7 @@ QBShared.Jobs = {
['police'] = { ['police'] = {
label = 'Law Enforcement', label = 'Law Enforcement',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Recruit', name = 'Recruit',
@@ -731,6 +733,7 @@ QBShared.Jobs = {
['ambulance'] = { ['ambulance'] = {
label = 'EMS', label = 'EMS',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Recruit', name = 'Recruit',
@@ -758,6 +761,7 @@ QBShared.Jobs = {
['realestate'] = { ['realestate'] = {
label = 'Real Estate', label = 'Real Estate',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Recruit', name = 'Recruit',
@@ -785,6 +789,7 @@ QBShared.Jobs = {
['taxi'] = { ['taxi'] = {
label = 'Taxi', label = 'Taxi',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Recruit', name = 'Recruit',
@@ -812,6 +817,7 @@ QBShared.Jobs = {
['bus'] = { ['bus'] = {
label = 'Bus', label = 'Bus',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Driver', name = 'Driver',
@@ -822,6 +828,7 @@ QBShared.Jobs = {
['cardealer'] = { ['cardealer'] = {
label = 'Vehicle Dealer', label = 'Vehicle Dealer',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Recruit', name = 'Recruit',
@@ -849,6 +856,7 @@ QBShared.Jobs = {
['mechanic'] = { ['mechanic'] = {
label = 'Mechanic', label = 'Mechanic',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Recruit', name = 'Recruit',
@@ -876,6 +884,7 @@ QBShared.Jobs = {
['judge'] = { ['judge'] = {
label = 'Honorary', label = 'Honorary',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Judge', name = 'Judge',
@@ -886,6 +895,7 @@ QBShared.Jobs = {
['lawyer'] = { ['lawyer'] = {
label = 'Law Firm', label = 'Law Firm',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Associate', name = 'Associate',
@@ -896,6 +906,7 @@ QBShared.Jobs = {
['reporter'] = { ['reporter'] = {
label = 'Reporter', label = 'Reporter',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Journalist', name = 'Journalist',
@@ -906,6 +917,7 @@ QBShared.Jobs = {
['trucker'] = { ['trucker'] = {
label = 'Trucker', label = 'Trucker',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Driver', name = 'Driver',
@@ -916,6 +928,7 @@ QBShared.Jobs = {
['tow'] = { ['tow'] = {
label = 'Towing', label = 'Towing',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Driver', name = 'Driver',
@@ -926,6 +939,7 @@ QBShared.Jobs = {
['garbage'] = { ['garbage'] = {
label = 'Garbage', label = 'Garbage',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Collector', name = 'Collector',
@@ -936,6 +950,7 @@ QBShared.Jobs = {
['vineyard'] = { ['vineyard'] = {
label = 'Vineyard', label = 'Vineyard',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Picker', name = 'Picker',
@@ -946,6 +961,7 @@ QBShared.Jobs = {
['hotdog'] = { ['hotdog'] = {
label = 'Hotdog', label = 'Hotdog',
defaultDuty = true, defaultDuty = true,
offDutyPay = false,
grades = { grades = {
['0'] = { ['0'] = {
name = 'Sales', name = 'Sales',