From 22b77b8d927f9818c03f8b29f148f8653dd5fc1d Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 9 Nov 2018 22:32:09 +0100 Subject: [PATCH] Fixed pharmacy color --- locales/br.lua | 2 +- locales/en.lua | 2 +- locales/es.lua | 2 +- locales/fi.lua | 2 +- locales/fr.lua | 2 +- locales/pl.lua | 2 +- locales/sv.lua | 4 ++-- server/main.lua | 4 +++- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 2d7db462..cc22645d 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -30,7 +30,7 @@ Locales['br'] = { ['fast_travel'] = 'Aperte ~INPUT_CONTEXT~ para mover-se rapidamente.', ['open_pharmacy'] = 'Aperte ~INPUT_CONTEXT~ para abrir a farmácia.', ['pharmacy_menu_title'] = 'Farmácia', - ['pharmacy_take'] = 'tomar ~y~%s~s~', + ['pharmacy_take'] = 'tomar %s', ['medikit'] = 'Seringa', ['bandage'] = 'Vendagem', ['max_item'] = 'você já carrega o suficiente sobre você.', diff --git a/locales/en.lua b/locales/en.lua index 053012f2..ca1b0d39 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -30,7 +30,7 @@ Locales['en'] = { ['fast_travel'] = 'press ~INPUT_CONTEXT~ to fast travel.', ['open_pharmacy'] = 'press ~INPUT_CONTEXT~ to open the pharmacy.', ['pharmacy_menu_title'] = 'pharmacy', - ['pharmacy_take'] = 'take ~y~%s~s~', + ['pharmacy_take'] = 'take %s', ['medikit'] = 'medikit', ['bandage'] = 'bandage', ['max_item'] = 'You are already carrying enough.', diff --git a/locales/es.lua b/locales/es.lua index df241022..aea37cb3 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -30,7 +30,7 @@ Locales['es'] = { ['fast_travel'] = 'Press ~INPUT_CONTEXT~ to fast travel.', ['open_pharmacy'] = 'Press ~INPUT_CONTEXT~ to open the pharmacy.', ['pharmacy_menu_title'] = 'Pharmacy', - ['pharmacy_take'] = 'take ~y~%s~s~', + ['pharmacy_take'] = 'take %s', ['medikit'] = 'medikit', ['bandage'] = 'bandage', ['max_item'] = 'You are already carrying enough on yourself.', diff --git a/locales/fi.lua b/locales/fi.lua index d474c1f5..841e6a89 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -30,7 +30,7 @@ Locales['fi'] = { ['fast_travel'] = 'paina ~INPUT_CONTEXT~ liikkuaksesi nopeasti kerrosten välillä', ['open_pharmacy'] = 'paina ~INPUT_CONTEXT~ avataksesi lääkekaappi', ['pharmacy_menu_title'] = 'lääkekaappi', - ['pharmacy_take'] = 'ota ~y~%s~s~', + ['pharmacy_take'] = 'ota %s', ['medikit'] = 'ensiapupakkauksia', ['bandage'] = 'sideharsoja', ['max_item'] = 'sinulla on jo tarpeeksi mukana', diff --git a/locales/fr.lua b/locales/fr.lua index 3dc156b1..cfc249db 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -30,7 +30,7 @@ Locales['fr'] = { ['fast_travel'] = 'appuyez sur ~INPUT_CONTEXT~ pour vous déplacer rapidement.', ['open_pharmacy'] = 'appuyez sur ~INPUT_CONTEXT~ pour ouvrir la pharmacie.', ['pharmacy_menu_title'] = 'Pharmacie', - ['pharmacy_take'] = 'prendre ~y~%s~s~', + ['pharmacy_take'] = 'prendre %s', ['medikit'] = 'kit de soin', ['bandage'] = 'bandage', ['max_item'] = 'vous en portez déjà assez sur vous.', diff --git a/locales/pl.lua b/locales/pl.lua index e301f8b4..6d523288 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -30,7 +30,7 @@ Locales['pl'] = { ['fast_travel'] = 'naciśnij na ~INPUT_CONTEXT~ do szybkiej podróży.', ['open_pharmacy'] = 'naciśnij na ~INPUT_CONTEXT~ aby otworzyć aptekę', ['pharmacy_menu_title'] = 'apteka', - ['pharmacy_take'] = 'weź ~y~%s~s~', + ['pharmacy_take'] = 'weź %s', ['medikit'] = 'apteczka', ['bandage'] = 'bandaż', ['max_item'] = 'już masz na sobie dość.', diff --git a/locales/sv.lua b/locales/sv.lua index 7097678f..ea7abf73 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -23,14 +23,14 @@ Locales['sv'] = { -- Boss Menu ['boss_actions'] = 'chef meny', -- Misc - ['invalid_amount'] = '~r~ogiltig mängd', + ['invalid_amount'] = '~r~Ogiltig mängd', ['open_menu'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', ['deposit_amount'] = 'mängd att sätta in', ['money_withdraw'] = 'mängd att ta ut', ['fast_travel'] = 'tryck på ~INPUT_CONTEXT~ för att snabbresa.', ['open_pharmacy'] = 'tryck på ~INPUT_CONTEXT~ för att öppna apoteket.', ['pharmacy_menu_title'] = 'apotek', - ['pharmacy_take'] = 'ta ~y~%s~s~', + ['pharmacy_take'] = 'ta %s', ['medikit'] = 'medicinkit', ['bandage'] = 'bandage', ['max_item'] = 'du har redan tillräckligt mycket på dig.', diff --git a/server/main.lua b/server/main.lua index 649f4ae3..e2f86711 100644 --- a/server/main.lua +++ b/server/main.lua @@ -137,8 +137,8 @@ AddEventHandler('esx_ambulancejob:giveItem', function(itemName) end local xItem = xPlayer.getInventoryItem(itemName) - local count = 1 + if xItem.limit ~= -1 then count = xItem.limit - xItem.count end @@ -167,6 +167,7 @@ ESX.RegisterUsableItem('medikit', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeInventoryItem('medikit', 1) + TriggerClientEvent('esx_ambulancejob:heal', _source, 'big') TriggerClientEvent('esx:showNotification', _source, _U('used_medikit')) end) @@ -175,6 +176,7 @@ ESX.RegisterUsableItem('bandage', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeInventoryItem('bandage', 1) + TriggerClientEvent('esx_ambulancejob:heal', _source, 'small') TriggerClientEvent('esx:showNotification', _source, _U('used_bandage')) end)