diff --git a/client/job.lua b/client/job.lua index 94e5a782..d93a96aa 100644 --- a/client/job.lua +++ b/client/job.lua @@ -78,7 +78,7 @@ function OpenMobileAmbulanceActionsMenu() for i=1, 15, 1 do Citizen.Wait(900) - + ESX.Streaming.RequestAnimDict(lib, function() TaskPlayAnim(PlayerPedId(), lib, anim, 8.0, -8.0, -1, 0, 0, false, false, false) end) @@ -755,11 +755,11 @@ function OpenShopMenu(elements, restoreCoords, shopCoords) isInShopMenu = false ESX.UI.Menu.CloseAll() - + DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) SetEntityVisible(playerPed, true) - + ESX.Game.Teleport(playerPed, restoreCoords) else ESX.ShowNotification(_U('vehicleshop_money')) @@ -866,11 +866,11 @@ function OpenPharmacyMenu() title = _U('pharmacy_menu_title'), align = 'top-left', elements = { - {label = _U('pharmacy_take', _U('medikit')), value = 'medikit'}, - {label = _U('pharmacy_take', _U('bandage')), value = 'bandage'} + {label = _U('pharmacy_take', _U('medikit')), item = 'medikit', type = 'slider', value = 1, min = 1, max = 100}, + {label = _U('pharmacy_take', _U('bandage')), item = 'bandage', type = 'slider', value = 1, min = 1, max = 100} } }, function(data, menu) - TriggerServerEvent('esx_ambulancejob:giveItem', data.current.value) + TriggerServerEvent('esx_ambulancejob:giveItem', data.current.item, data.current.value) end, function(data, menu) menu.close() end) diff --git a/esx_ambulancejob.sql b/esx_ambulancejob.sql index d88d5676..c7a4097e 100644 --- a/esx_ambulancejob.sql +++ b/esx_ambulancejob.sql @@ -23,9 +23,9 @@ INSERT INTO `jobs` (name, label) VALUES ('ambulance','Ambulance') ; -INSERT INTO `items` (name, label, `limit`) VALUES - ('bandage','Bandage', 20), - ('medikit','Medikit', 5) +INSERT INTO `items` (name, label, weight) VALUES + ('bandage','Bandage', 2), + ('medikit','Medikit', 2) ; ALTER TABLE `users` diff --git a/localization/cs_esx_ambulancejob.sql b/localization/cs_esx_ambulancejob.sql index a8af1939..b5264a06 100644 --- a/localization/cs_esx_ambulancejob.sql +++ b/localization/cs_esx_ambulancejob.sql @@ -23,9 +23,9 @@ INSERT INTO `jobs` (name, label) VALUES ('ambulance','Záchranka') ; -INSERT INTO `items` (name, label, `limit`) VALUES - ('bandage','Obvaz', 20), - ('medikit','Lékarnička', 5) +INSERT INTO `items` (name, label, weight) VALUES + ('bandage','Obvaz', 2), + ('medikit','Lékarnička', 2) ; ALTER TABLE `users` diff --git a/localization/de_esx_ambulancejob.sql b/localization/de_esx_ambulancejob.sql index 0ebf079d..bd1ff039 100644 --- a/localization/de_esx_ambulancejob.sql +++ b/localization/de_esx_ambulancejob.sql @@ -23,9 +23,9 @@ INSERT INTO `jobs` (name, label) VALUES ('ambulance','Notdienst') ; -INSERT INTO `items` (name, label, `limit`) VALUES - ('bandage','Bandage', 20), - ('medikit','Medikit', 5) +INSERT INTO `items` (name, label, weight) VALUES + ('bandage','Bandage', 2), + ('medikit','Medikit', 2) ; ALTER TABLE `users` diff --git a/localization/en_esx_ambulancejob.sql b/localization/en_esx_ambulancejob.sql index 6bb4ecf1..6ba8b1a6 100644 --- a/localization/en_esx_ambulancejob.sql +++ b/localization/en_esx_ambulancejob.sql @@ -23,9 +23,9 @@ INSERT INTO `jobs` (name, label) VALUES ('ambulance','EMS') ; -INSERT INTO `items` (name, label, `limit`) VALUES - ('bandage','Bandage', 20), - ('medikit','Medikit', 5) +INSERT INTO `items` (name, label, weight) VALUES + ('bandage','Bandage', 2), + ('medikit','Medikit', 2) ; ALTER TABLE `users` diff --git a/localization/fi_esx_ambulancejob.sql b/localization/fi_esx_ambulancejob.sql index 7c001e0d..1508ad3d 100644 --- a/localization/fi_esx_ambulancejob.sql +++ b/localization/fi_esx_ambulancejob.sql @@ -23,9 +23,9 @@ INSERT INTO `jobs` (name, label) VALUES ('ambulance','Ensihoito') ; -INSERT INTO `items` (name, label, `limit`) VALUES - ('bandage','Sideharso', 20), - ('medikit','Ensiapupakkaus', 5) +INSERT INTO `items` (name, label, weight) VALUES + ('bandage','Sideharso', 2), + ('medikit','Ensiapupakkaus', 2) ; ALTER TABLE `users` diff --git a/localization/pl_esx_ambulancejob.sql b/localization/pl_esx_ambulancejob.sql index c3715181..2f52bad6 100644 --- a/localization/pl_esx_ambulancejob.sql +++ b/localization/pl_esx_ambulancejob.sql @@ -23,9 +23,9 @@ INSERT INTO `jobs` (name, label) VALUES ('ambulance','Pogotowie ratunkowe') ; -INSERT INTO `items` (name, label, `limit`) VALUES - ('bandage','Bandaż', 20), - ('medikit','Defibrylator', 5) +INSERT INTO `items` (name, label, weight) VALUES + ('bandage','Bandaż', 2), + ('medikit','Defibrylator', 2) ; ALTER TABLE `users` diff --git a/server/main.lua b/server/main.lua index 0f5b78d9..2003be0d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -99,7 +99,7 @@ if Config.EarlyRespawnFine then local xPlayer = ESX.GetPlayerFromId(source) local fineAmount = Config.EarlyRespawnFineAmount - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('respawn_bleedout_fine_msg', ESX.Math.GroupDigits(fineAmount))) + xPlayer.showNotification(_U('respawn_bleedout_fine_msg', ESX.Math.GroupDigits(fineAmount))) xPlayer.removeAccountMoney('bank', fineAmount) end) end @@ -122,7 +122,7 @@ ESX.RegisterServerCallback('esx_ambulancejob:buyJobVehicle', function(source, cb else if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) - + MySQL.Async.execute('INSERT INTO owned_vehicles (owner, vehicle, plate, type, job, `stored`) VALUES (@owner, @vehicle, @plate, @type, @job, @stored)', { ['@owner'] = xPlayer.identifier, ['@vehicle'] = json.encode(vehicleProps), @@ -205,14 +205,14 @@ AddEventHandler('esx_ambulancejob:removeItem', function(item) xPlayer.removeInventoryItem(item, 1) if item == 'bandage' then - TriggerClientEvent('esx:showNotification', _source, _U('used_bandage')) + xPlayer.showNotification(_U('used_bandage')) elseif item == 'medikit' then - TriggerClientEvent('esx:showNotification', _source, _U('used_medikit')) + xPlayer.showNotification(_U('used_medikit')) end end) RegisterServerEvent('esx_ambulancejob:giveItem') -AddEventHandler('esx_ambulancejob:giveItem', function(itemName) +AddEventHandler('esx_ambulancejob:giveItem', function(itemName, amount) local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.job.name ~= 'ambulance' then @@ -223,17 +223,10 @@ AddEventHandler('esx_ambulancejob:giveItem', function(itemName) return end - local xItem = xPlayer.getInventoryItem(itemName) - local count = 1 - - if xItem.limit ~= -1 then - count = xItem.limit - xItem.count - end - - if xItem.count < xItem.limit then - xPlayer.addInventoryItem(itemName, count) + if xPlayer.canCarryItem(itemName, amount) then + xPlayer.addInventoryItem(itemName, amount) else - TriggerClientEvent('esx:showNotification', source, _U('max_item')) + xPlayer.showNotification(_U('max_item')) end end) @@ -254,7 +247,7 @@ ESX.RegisterUsableItem('medikit', function(source) if not playersHealing[source] then local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeInventoryItem('medikit', 1) - + playersHealing[source] = true TriggerClientEvent('esx_ambulancejob:useItem', source, 'medikit') @@ -267,7 +260,7 @@ ESX.RegisterUsableItem('bandage', function(source) if not playersHealing[source] then local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeInventoryItem('bandage', 1) - + playersHealing[source] = true TriggerClientEvent('esx_ambulancejob:useItem', source, 'bandage')