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

Update sv_boss.lua, cl_boss.lua #116

Closed
wants to merge 6 commits into from
Closed

Update sv_boss.lua, cl_boss.lua #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7789958
Update cl_boss.lua
nitayStain Jan 31, 2024
f419036
Update sv_boss.lua
nitayStain Jan 31, 2024
9b3874d
Update sv_boss.lua
nitayStain Jan 31, 2024
7ba4be4
changed option's logo
nitayStain Jan 31, 2024
ce57e70
Update sv_boss.lua
nitayStain Feb 2, 2024
f3ee71f
Update cl_boss.lua
nitayStain Feb 2, 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
24 changes: 18 additions & 6 deletions client/cl_boss.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ end)

RegisterNetEvent('qb-bossmenu:client:OpenMenu', function()
if not PlayerJob.name or not PlayerJob.isboss then return end

local bossMenu = {
{
header = Lang:t('headers.bsm') .. string.upper(PlayerJob.label),
Expand Down Expand Up @@ -80,19 +80,19 @@ RegisterNetEvent('qb-bossmenu:client:OpenMenu', function()
}
}
}

for _, v in pairs(DynamicMenuItems) do
bossMenu[#bossMenu + 1] = v
end

bossMenu[#bossMenu + 1] = {
header = Lang:t('body.exit'),
icon = 'fa-solid fa-angle-left',
params = {
event = 'qb-menu:closeMenu',
}
}

exports['qb-menu']:openMenu(bossMenu)
end)

Expand Down Expand Up @@ -133,7 +133,7 @@ end)
RegisterNetEvent('qb-bossmenu:client:ManageEmployee', function(data)
local EmployeeMenu = {
{
header = Lang:t('body.mngpl') .. data.player.name .. ' - ' .. string.upper(PlayerJob.label),
header = Lang:t('body.mngpl') .. data.player.name .. ' - ' .. string.upper(PlayerJob.label) .. ' (' .. (data.player.onduty and 'on duty' or 'off duty') .. ')',
isMenuHeader = true,
icon = 'fa-solid fa-circle-info'
},
Expand All @@ -154,6 +154,17 @@ RegisterNetEvent('qb-bossmenu:client:ManageEmployee', function(data)
}
}
end

EmployeeMenu[#EmployeeMenu + 1] = {
header = Lang:t('body.dutyemp'),
icon = data.player.onduty and 'fa-solid fa-user-minus' or 'fa-solid fa-user-plus',
params = {
isServer = true,
event = 'qb-bossmenu:server:toggleEmployeeDuty',
args = data.player.empSource
}
}

EmployeeMenu[#EmployeeMenu + 1] = {
header = Lang:t('body.fireemp'),
icon = 'fa-solid fa-user-large-slash',
Expand All @@ -163,6 +174,7 @@ RegisterNetEvent('qb-bossmenu:client:ManageEmployee', function(data)
args = data.player.empSource
}
}

EmployeeMenu[#EmployeeMenu + 1] = {
header = Lang:t('body.return'),
icon = 'fa-solid fa-angle-left',
Expand Down Expand Up @@ -268,7 +280,7 @@ CreateThread(function()
TriggerEvent('qb-bossmenu:client:OpenMenu')
end
end

if not nearBossmenu and shownBossMenu then
CloseMenuFull()
shownBossMenu = false
Expand Down
28 changes: 28 additions & 0 deletions server/sv_boss.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@ QBCore.Functions.CreateCallback('qb-bossmenu:server:GetEmployees', function(sour
empSource = isOnline.PlayerData.citizenid,
grade = isOnline.PlayerData.job.grade,
isboss = isOnline.PlayerData.job.isboss,
onduty = isOnline.PlayerData.job.onduty,
name = '🟢 ' .. isOnline.PlayerData.charinfo.firstname .. ' ' .. isOnline.PlayerData.charinfo.lastname
}
elseif value.job.name == jobname then
employees[#employees + 1] = {
empSource = value.citizenid,
grade = value.job.grade,
isboss = value.job.isboss,
onduty = false,
name = '❌ ' .. value.charinfo.firstname .. ' ' .. value.charinfo.lastname
}
end
Expand Down Expand Up @@ -138,6 +140,32 @@ RegisterNetEvent('qb-bossmenu:server:FireEmployee', function(target)
TriggerClientEvent('qb-bossmenu:client:OpenMenu', src)
end)

-- Toggle Duty
RegisterNetEvent('qb-bossmenu:server:toggleEmployeeDuty', function(target)
local src = source
local Player = QBCore.Functions.GetPlayer(src)
local Target = QBCore.Functions.GetPlayerByCitizenId(target)

if not Player.PlayerData.job.isboss then
nitayStain marked this conversation as resolved.
Show resolved Hide resolved
ExploitBan(src, 'HireEmployee Exploiting')
return
end

if Target and Player.PlayerData.job.name == Target.PlayerData.job.name then
Target.Functions.SetJobDuty(not Target.PlayerData.job.onduty)

if Target.PlayerData.job.onduty then
TriggerClientEvent('QBCore:Notify', src, 'You toggled on duty!', 'info')
TriggerClientEvent('QBCore:Notify', Target.PlayerData.source, 'You are now on duty!', 'info')
else
TriggerClientEvent('QBCore:Notify', src, 'You toggled off duty!', 'info')
TriggerClientEvent('QBCore:Notify', Target.PlayerData.source, 'You are now off duty!', 'info')
end
end

TriggerClientEvent('qb-bossmenu:client:OpenMenu', src)
end)

-- Recruit Player
RegisterNetEvent('qb-bossmenu:server:HireEmployee', function(recruit)
local src = source
Expand Down
Loading