starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-30 17:58:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from Poggicek/master

Browse Source 
Added weight support and amount sliders to pharmacy menu
This commit is contained in:
Samuel
2019-10-27 00:19:25 +02:00
committed by GitHub
parent 88b284f925 7ca8779b90
commit b3c2a520ab
8 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/job.lua
+6 -6
View File
@@ -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'))
@@ -865,11 +865,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)
esx_ambulancejob.sql
+3 -3
View File
@@ -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`
localization/cs_esx_ambulancejob.sql
+3 -3
View File
@@ -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`
localization/de_esx_ambulancejob.sql
+3 -3
View File
@@ -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`
localization/en_esx_ambulancejob.sql
+3 -3
View File
@@ -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`
localization/fi_esx_ambulancejob.sql
+3 -3
View File
@@ -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`
localization/pl_esx_ambulancejob.sql
+3 -3
View File
@@ -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`
server/main.lua
+10 -17
View File
@@ -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')