starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 08:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hardcoded strings, added new trigger esx:onPlayerDeath

Browse Source
This commit is contained in:
ElPumpo
2018-04-14 14:25:37 +02:00
parent 6f79aef90f
commit 2e67349645
6 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/main.lua
+1 -1
View File
@@ -569,7 +569,7 @@ AddEventHandler('esx:onPickup', function(id)
end
if remaining > 0 then
TriggerClientEvent('esx:showNotification', _source, 'Vous n\'avez plus de place pour ~b~' .. item.label .. '~s~')
TriggerClientEvent('esx:showNotification', _source, _U('cannot_pickup_room', item.label))
ESX.CreatePickup('item_standard', pickup.name, remaining, item.label .. ' [' .. remaining .. ']', _source)
end
server/paycheck_company.lua
+24 -24
View File
@@ -1,30 +1,30 @@
ESX.StartPayCheck = function ()
function payCheck ()
local xPlayers = ESX.GetPlayers()
for i=1, #xPlayers, 1 do
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
if xPlayer.job.grade_name == 'interim' or xPlayer.job.grade_name == 'rsa' or xPlayer.job.grade_name == 'employee' then -- Si il n'est pas dans une société, je prends chez l'état
if xPlayer.job.grade_salary > 0 then
xPlayer.addAccountMoney('bank',xPlayer.job.grade_salary)
TriggerClientEvent('esx:showNotification', xPlayer.source, ('L\'état vous a payé ') .. '~g~$' .. xPlayer.job.grade_salary)
end
else -- Sinon je prends l'argent dans la société
TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society)
TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function (account)
if account.money >= xPlayer.job.grade_salary then
xPlayer.addAccountMoney('bank',xPlayer.job.grade_salary)
account.removeMoney(xPlayer.job.grade_salary)
TriggerClientEvent('esx:showNotification', xPlayer.source, ('Votre entreprise vous a payé ') .. '~g~$' .. xPlayer.job.grade_salary)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, 'Votre entreprise n\'a plus d\'argent pour vous payer !')
end
end)
end)
end
end
function payCheck ()
local xPlayers = ESX.GetPlayers()
for i=1, #xPlayers, 1 do
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
if xPlayer.job.grade_name == 'interim' or xPlayer.job.grade_name == 'rsa' or xPlayer.job.grade_name == 'employee' then -- only if the player is employeed in a company
if xPlayer.job.grade_salary > 0 then
xPlayer.addAccountMoney('bank', xPlayer.job.grade_salary)
TriggerClientEvent('esx:showNotification', xPlayer.source, ('L\'état vous a payé ') .. '~g~$' .. xPlayer.job.grade_salary)
end
else -- Else take money from society
TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society)
TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function (account)
if account.money >= xPlayer.job.grade_salary then
xPlayer.addAccountMoney('bank',xPlayer.job.grade_salary)
account.removeMoney(xPlayer.job.grade_salary)
TriggerClientEvent('esx:showNotification', xPlayer.source, ('Votre entreprise vous a payé ') .. '~g~$' .. xPlayer.job.grade_salary)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, 'Votre entreprise n\'a plus d\'argent pour vous payer !')
end
end)
end)
end
end
SetTimeout(Config.PaycheckInterval, payCheck)
SetTimeout(Config.PaycheckInterval, payCheck)
end
SetTimeout(Config.PaycheckInterval, payCheck)
end