From 900173887f3833606131e4be34be8cbbfe852ce4 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Mon, 4 Sep 2017 20:12:18 -0500 Subject: [PATCH 1/4] Update main.lua --- server/main.lua | 58 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/server/main.lua b/server/main.lua index b938d860..823ce96d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -116,16 +116,30 @@ end) ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source, cb, target) + if Config.EnableGCIdentity then + local xPlayer = ESX.GetPlayerFromId(target) - + + local identifier = GetPlayerIdentifiers(target)[1] + + local result = MySQL.Sync.fetchAll("SELECT firstname, lastname, sex, dateofbirth, height FROM users WHERE identifier = @identifier", { + ['@identifier'] = identifier + }) + + local user = result[1] + local firstname = user['firstname'] + local lastname = user['lastname'] + local data = { - name = GetPlayerName(target), - job = xPlayer.job, - inventory = xPlayer.inventory, - accounts = xPlayer.accounts, - weapons = xPlayer.loadout + name = GetPlayerName(target), + job = xPlayer.job, + inventory = xPlayer.inventory, + accounts = xPlayer.accounts, + weapons = xPlayer.loadout, + firstname = firstname, + lastname = lastname } - + TriggerEvent('esx_status:getStatus', _source, 'drunk', function(status) if status ~= nil then @@ -139,6 +153,34 @@ ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source, end) cb(data) + + else + + local xPlayer = ESX.GetPlayerFromId(target) + + local data = { + name = GetPlayerName(target), + job = xPlayer.job, + inventory = xPlayer.inventory, + accounts = xPlayer.accounts, + weapons = xPlayer.loadout + } + + TriggerEvent('esx_status:getStatus', _source, 'drunk', function(status) + + if status ~= nil then + data.drunk = status.getPercent() + end + + end) + + TriggerEvent('esx_license:getLicenses', _source, function(licenses) + data.licenses = licenses + end) + + cb(data) + + end end) @@ -335,4 +377,4 @@ ESX.RegisterServerCallback('esx_policejob:getPlayerInventory', function(source, items = items }) -end) \ No newline at end of file +end) From 31e9cbf88c23288574a64958a32ffffedfffddf8 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Mon, 4 Sep 2017 20:13:51 -0500 Subject: [PATCH 2/4] Update main.lua --- client/main.lua | 125 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 88 insertions(+), 37 deletions(-) diff --git a/client/main.lua b/client/main.lua index 8a85f61c..3bd6c0ed 100644 --- a/client/main.lua +++ b/client/main.lua @@ -481,54 +481,105 @@ end function OpenIdentityCardMenu(player) - ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data) + if Config.EnableGCIdentity then + + ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data) - local jobLabel = nil + local jobLabel = nil - if data.job.grade_label ~= nil and data.job.grade_label ~= '' then - jobLabel = 'Job : ' .. data.job.label .. ' - ' .. data.job.grade_label - else - jobLabel = 'Job : ' .. data.job.label - end + if data.job.grade_label ~= nil and data.job.grade_label ~= '' then + jobLabel = 'Job : ' .. data.job.label .. ' - ' .. data.job.grade_label + else + jobLabel = 'Job : ' .. data.job.label + end + + local elements = { + {label = _U('name') .. data.firstname .. " " .. data.lastname, value = nil}, + {label = jobLabel, value = nil}, + } - local elements = { - {label = _U('name') .. data.name, value = nil}, - {label = jobLabel, value = nil}, - } - - if data.drunk ~= nil then - table.insert(elements, {label = _U('bac') .. data.drunk .. '%', value = nil}) - end - - if data.licenses ~= nil then - - table.insert(elements, {label = '--- Licenses ---', value = nil}) - - for i=1, #data.licenses, 1 do - table.insert(elements, {label = data.licenses[i].label, value = nil}) + if data.drunk ~= nil then + table.insert(elements, {label = _U('bac') .. data.drunk .. '%', value = nil}) end - end + if data.licenses ~= nil then - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'citizen_interaction', - { - title = _U('citizen_interaction'), - align = 'top-left', - elements = elements, - }, - function(data, menu) + table.insert(elements, {label = '--- Licenses ---', value = nil}) + + for i=1, #data.licenses, 1 do + table.insert(elements, {label = data.licenses[i].label, value = nil}) + end - end, - function(data, menu) - menu.close() end - ) - end, GetPlayerServerId(player)) + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'citizen_interaction', + { + title = _U('citizen_interaction'), + align = 'top-left', + elements = elements, + }, + function(data, menu) + + end, + function(data, menu) + menu.close() + end + ) + + end, GetPlayerServerId(player)) + + else + + ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data) + + local jobLabel = nil + + if data.job.grade_label ~= nil and data.job.grade_label ~= '' then + jobLabel = 'Job : ' .. data.job.label .. ' - ' .. data.job.grade_label + else + jobLabel = 'Job : ' .. data.job.label + end + + local elements = { + {label = _U('name') .. data.name, value = nil}, + {label = jobLabel, value = nil}, + } + + if data.drunk ~= nil then + table.insert(elements, {label = _U('bac') .. data.drunk .. '%', value = nil}) + end + + if data.licenses ~= nil then + + table.insert(elements, {label = '--- Licenses ---', value = nil}) + + for i=1, #data.licenses, 1 do + table.insert(elements, {label = data.licenses[i].label, value = nil}) + end + + end + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'citizen_interaction', + { + title = _U('citizen_interaction'), + align = 'top-left', + elements = elements, + }, + function(data, menu) + + end, + function(data, menu) + menu.close() + end + ) + + end, GetPlayerServerId(player)) + + end end - function OpenBodySearchMenu(player) ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data) From 0b291ad4d253637c92c30279f89455f04163fd10 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Mon, 4 Sep 2017 20:14:19 -0500 Subject: [PATCH 3/4] Update config.lua --- config.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.lua b/config.lua index b111e511..55f7aa9e 100644 --- a/config.lua +++ b/config.lua @@ -5,6 +5,7 @@ Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0} Config.MarkerColor = {r = 50, g = 50, b = 204} Config.EnablePlayerManagement = false Config.EnableArmoryManagement = false +Config.EnableGCIdentity = false Config.MaxInService = -1 Config.Locale = 'fr' @@ -75,4 +76,4 @@ Config.PoliceStations = { } -} \ No newline at end of file +} From 014fe0c862c5d2eecbdef1680ff7816c1fbd15a5 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Mon, 4 Sep 2017 20:21:42 -0500 Subject: [PATCH 4/4] Update main.lua --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index 3bd6c0ed..cc212948 100644 --- a/client/main.lua +++ b/client/main.lua @@ -580,6 +580,7 @@ function OpenIdentityCardMenu(player) end end + function OpenBodySearchMenu(player) ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data)