diff --git a/client/main.lua b/client/main.lua index 8dba3eb3..855c84ae 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,7 +10,6 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -local PlayerData = {} local hasAlreadyEnteredMarker = false local lastZone = nil local CurrentAction = nil @@ -25,26 +24,30 @@ Citizen.CreateThread(function () Citizen.Wait(0) end - + while ESX.GetPlayerData().job == nil do + Citizen.Wait(100) + end + + ESX.PlayerData = ESX.GetPlayerData() end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function (xPlayer) - PlayerData = xPlayer + ESX.PlayerData = xPlayer end) RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function (job) - PlayerData.job = job + ESX.PlayerData.job = job end) function OpenBankActionsMenu() local elements = { { label = _U('customers'), value = 'customers' }, - { label = _U('billing'), value = 'billing' }, + { label = _U('billing'), value = 'billing' } } - if PlayerData.job.grade_name == 'boss' then + if ESX.PlayerData.job.grade_name == 'boss' then table.insert(elements, { label = _U('boss_actions'), value = 'boss_actions' }) end @@ -169,7 +172,7 @@ function OpenCustomersMenu() end AddEventHandler('esx_bankerjob:hasEnteredMarker', function (zone) - if zone == 'BankActions' and PlayerData.job ~= nil and PlayerData.job.name == 'banker' then + if zone == 'BankActions' and ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name == 'banker' then CurrentAction = 'bank_actions_menu' CurrentActionMsg = _U('press_input_context_to_open_menu') CurrentActionData = {} @@ -215,7 +218,7 @@ Citizen.CreateThread(function() local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.Zones) do - if(PlayerData.job ~= nil and PlayerData.job.name == 'banker' and v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then + if(ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name == 'banker' and v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) end end @@ -227,7 +230,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(10) - if(PlayerData.job ~= nil and PlayerData.job.name == 'banker') then + if(ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name == 'banker') then local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil @@ -262,14 +265,15 @@ Citizen.CreateThread(function () if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) - if IsControlJustReleased(0, Keys['E']) and PlayerData.job ~= nil and PlayerData.job.name == 'banker' then + if IsControlJustReleased(0, Keys['E']) and ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name == 'banker' then if CurrentAction == 'bank_actions_menu' then OpenBankActionsMenu() end CurrentAction = nil end + else + Citizen.Wait(500) end - end end) diff --git a/config.lua b/config.lua index c2336801..391f8ce5 100644 --- a/config.lua +++ b/config.lua @@ -5,11 +5,11 @@ Config.Locale = 'fr' Config.Zones = { - BankActions = { - Pos = { x = 260.130, y = 204.308, z = 109.287 }, - Size = { x = 1.5, y = 1.5, z = 1.0 }, - Color = { r = 102, g = 102, b = 204 }, - Type = 1 - } + BankActions = { + Pos = { x = 260.130, y = 204.308, z = 109.287 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Color = { r = 102, g = 102, b = 204 }, + Type = 1 + } } diff --git a/esx_bankerjob.sql b/esx_bankerjob.sql index 6294b3ff..90b8b128 100644 --- a/esx_bankerjob.sql +++ b/esx_bankerjob.sql @@ -1,18 +1,18 @@ USE `essentialmode`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_banker','Banque',1), - ('bank_savings','Livret Bleu',0) + ('society_banker','Banque',1), + ('bank_savings','Livret Bleu',0) ; INSERT INTO `jobs` (name, label) VALUES - ('banker','Banquier') + ('banker','Banquier') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('banker',0,'advisor','Conseiller',10,'{}','{}'), - ('banker',1,'banker','Banquier',20,'{}','{}'), - ('banker',2,'business_banker',"Banquier d\'affaire",30,'{}','{}'), - ('banker',3,'trader','Trader',40,'{}','{}'), - ('banker',4,'boss','Patron',0,'{}','{}') + ('banker',0,'advisor','Conseiller',10,'{}','{}'), + ('banker',1,'banker','Banquier',20,'{}','{}'), + ('banker',2,'business_banker',"Banquier d\'affaire",30,'{}','{}'), + ('banker',3,'trader','Trader',40,'{}','{}'), + ('banker',4,'boss','Patron',0,'{}','{}') ; diff --git a/localization/de_esx_bankerjob.sql b/localization/de_esx_bankerjob.sql index af0919b5..a1da4469 100644 --- a/localization/de_esx_bankerjob.sql +++ b/localization/de_esx_bankerjob.sql @@ -1,18 +1,18 @@ USE `essentialmode`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_banker','Bank',1), - ('bank_savings','Bank',0) + ('society_banker','Bank',1), + ('bank_savings','Bank',0) ; INSERT INTO `jobs` (name, label) VALUES - ('banker','Banker') + ('banker','Banker') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('banker',0,'advisor','Berater',10,'{}','{}'), - ('banker',1,'banker','Banker',20,'{}','{}'), - ('banker',2,'business_banker','Business Banker',30,'{}','{}'), - ('banker',3,'trader','Trader',40,'{}','{}'), - ('banker',4,'boss','Boss',0,'{}','{}') + ('banker',0,'advisor','Berater',10,'{}','{}'), + ('banker',1,'banker','Banker',20,'{}','{}'), + ('banker',2,'business_banker','Business Banker',30,'{}','{}'), + ('banker',3,'trader','Trader',40,'{}','{}'), + ('banker',4,'boss','Boss',0,'{}','{}') ; diff --git a/localization/en_esx_bankerjob.sql b/localization/en_esx_bankerjob.sql index 798d271e..d70d5647 100644 --- a/localization/en_esx_bankerjob.sql +++ b/localization/en_esx_bankerjob.sql @@ -1,18 +1,18 @@ USE `essentialmode`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_banker','Bank',1), - ('bank_savings','Bank Savings',0) + ('society_banker','Bank',1), + ('bank_savings','Bank Savings',0) ; INSERT INTO `jobs` (name, label) VALUES - ('banker','Banker') + ('banker','Banker') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('banker',0,'advisor','Advisor',10,'{}','{}'), - ('banker',1,'banker','Banker',20,'{}','{}'), - ('banker',2,'business_banker','Business Banker',30,'{}','{}'), - ('banker',3,'trader','Trader',40,'{}','{}'), - ('banker',4,'boss','Lead Banker',0,'{}','{}') + ('banker',0,'advisor','Advisor',10,'{}','{}'), + ('banker',1,'banker','Banker',20,'{}','{}'), + ('banker',2,'business_banker','Business Banker',30,'{}','{}'), + ('banker',3,'trader','Trader',40,'{}','{}'), + ('banker',4,'boss','Lead Banker',0,'{}','{}') ; diff --git a/localization/fi_esx_bankerjob.sql b/localization/fi_esx_bankerjob.sql index b5755b39..36332571 100644 --- a/localization/fi_esx_bankerjob.sql +++ b/localization/fi_esx_bankerjob.sql @@ -1,18 +1,18 @@ USE `essentialmode`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_banker','Pankki',1), - ('bank_savings','Pankki',0) + ('society_banker','Pankki',1), + ('bank_savings','Pankki',0) ; INSERT INTO `jobs` (name, label) VALUES - ('banker','Pankkiiri') + ('banker','Pankkiiri') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('banker',0,'advisor','Konsultti',10,'{}','{}'), - ('banker',1,'banker','Pankkiiri',20,'{}','{}'), - ('banker',2,'business_banker','Yritys Pankkiiri',30,'{}','{}'), - ('banker',3,'trader','Välittäjä',40,'{}','{}'), - ('banker',4,'boss','Pomo',0,'{}','{}') + ('banker',0,'advisor','Konsultti',10,'{}','{}'), + ('banker',1,'banker','Pankkiiri',20,'{}','{}'), + ('banker',2,'business_banker','Yritys Pankkiiri',30,'{}','{}'), + ('banker',3,'trader','Välittäjä',40,'{}','{}'), + ('banker',4,'boss','Pomo',0,'{}','{}') ;