diff --git a/config.lua b/config.lua index acd002bd..baaecda1 100644 --- a/config.lua +++ b/config.lua @@ -2,6 +2,7 @@ Config = {} Config.DrawDistance = 100.0 Config.MarkerColor = { r = 102, g = 0, b = 102 } Config.MarkerSize = { x = 1.5, y = 1.5, z = 1.0 } +Config.ReviveReward = 700 local second = 1000 local minute = 60 * second diff --git a/server/main.lua b/server/main.lua index 014bca39..6229ad4a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,7 +4,11 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_ambulancejob:revive') AddEventHandler('esx_ambulancejob:revive', function(target) - TriggerClientEvent('esx_ambulancejob:revive', target) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + xPlayer.addMoney(Config.ReviveReward) + TriggerClientEvent('esx_ambulancejob:revive', target) end) RegisterServerEvent('esx_ambulancejob:heal') @@ -17,8 +21,8 @@ TriggerEvent('esx_phone:registerNumber', 'ambulance', _U('alert_ambulance'), tru TriggerEvent('esx_society:registerSociety', 'ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'}) ESX.RegisterServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function(source, cb) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + + local xPlayer = ESX.GetPlayerFromId(source) if Config.RemoveCashAfterRPDeath then @@ -55,8 +59,7 @@ ESX.RegisterServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function( end) ESX.RegisterServerCallback('esx_ambulancejob:getItemAmount', function(source, cb, item) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) local qtty = xPlayer.getInventoryItem(item).count cb(qtty) end) @@ -90,30 +93,31 @@ AddEventHandler('esx_ambulancejob:giveItem', function(item) end end) - TriggerEvent('es:addGroupCommand', 'revive', 'admin', function(source, args, user) - print('revive by /revive') - if args[1] ~= nil then - TriggerClientEvent('esx_ambulancejob:revive', tonumber(args[1])) - else - TriggerClientEvent('esx_ambulancejob:revive', source) - end + if args[1] ~= nil then + if GetPlayerName(tonumber(args[1])) ~= nil then + print('esx_ambulancejob: ' .. GetPlayerName(source) .. ' is reviving a player!') + TriggerClientEvent('esx_ambulancejob:revive', tonumber(args[1])) + end + else + TriggerClientEvent('esx_ambulancejob:revive', source) + end end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('revive_help'), params = {{name = 'id'}}}) ESX.RegisterUsableItem('medikit', function(source) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeInventoryItem('medikit', 1) - TriggerClientEvent('esx_ambulancejob:heal', source, 'big') - TriggerClientEvent('esx:showNotification', source, _U('used_medikit')) + TriggerClientEvent('esx_ambulancejob:heal', _source, 'big') + TriggerClientEvent('esx:showNotification', _source, _U('used_medikit')) end) ESX.RegisterUsableItem('bandage', function(source) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeInventoryItem('bandage', 1) - TriggerClientEvent('esx_ambulancejob:heal', source, 'small') - TriggerClientEvent('esx:showNotification', source, _U('used_bandage')) + TriggerClientEvent('esx_ambulancejob:heal', _source, 'small') + TriggerClientEvent('esx:showNotification', _source, _U('used_bandage')) end)