From ac8d7efbf2a181b55b6e8358bc2d5ecf3c170808 Mon Sep 17 00:00:00 2001 From: Christian J Bennett Date: Thu, 23 May 2024 20:18:53 -0500 Subject: [PATCH 1/3] Added Chat Messages for the Id's again --- server/main.lua | 70 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 17 deletions(-) diff --git a/server/main.lua b/server/main.lua index 9f468c9df..85ed2bcfb 100644 --- a/server/main.lua +++ b/server/main.lua @@ -119,17 +119,6 @@ AddEventHandler('onResourceStart', function(resourceName) end end) --- Functions - -local function checkWeapon(source, item) - local ped = GetPlayerPed(source) - local weapon = GetSelectedPedWeapon(ped) - local weaponInfo = QBCore.Shared.Weapons[weapon] - if weaponInfo and weaponInfo.name == item.name then - RemoveWeaponFromPed(ped, weapon) - end -end - -- Events RegisterNetEvent('qb-inventory:server:openVending', function() @@ -173,6 +162,54 @@ RegisterNetEvent('qb-inventory:server:useItem', function(item) if itemData.type == 'weapon' then TriggerClientEvent('qb-weapons:client:UseWeapon', source, itemData, itemData.info.quality and itemData.info.quality > 0) TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use') + elseif itemData.name == 'id_card' then + UseItem(itemData.name, source, itemData) + TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use') + local playerPed = GetPlayerPed(source) + local playerCoords = GetEntityCoords(playerPed) + local players = QBCore.Functions.GetPlayers() + local gender = item.info.gender == 0 and 'Male' or 'Female' + for _, v in pairs(players) do + local targetPed = GetPlayerPed(v) + local dist = #(playerCoords - GetEntityCoords(targetPed)) + if dist < 3.0 then + TriggerClientEvent('chat:addMessage', v, { + template = '', + args = { + 'ID Card', + item.info.citizenid, + item.info.firstname, + item.info.lastname, + item.info.birthdate, + gender, + item.info.nationality + } + }) + end + end + elseif itemData.name == 'driver_license' then + UseItem(itemData.name, source, itemData) + TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use') + local playerPed = GetPlayerPed(source) + local playerCoords = GetEntityCoords(playerPed) + local players = QBCore.Functions.GetPlayers() + for _, v in pairs(players) do + local targetPed = GetPlayerPed(v) + local dist = #(playerCoords - GetEntityCoords(targetPed)) + if dist < 3.0 then + TriggerClientEvent('chat:addMessage', v, { + template = '', + args = { + 'Drivers License', + item.info.firstname, + item.info.lastname, + item.info.birthdate, + item.info.type + } + } + ) + end + end else UseItem(itemData.name, source, itemData) TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use') @@ -207,9 +244,9 @@ end) RegisterNetEvent('qb-inventory:server:snowball', function(action) if action == 'add' then - AddItem(source, 'weapon_snowball', 1, false, false, 'qb-inventory:server:snowball') + AddItem(source, 'weapon_snowball') elseif action == 'remove' then - RemoveItem(source, 'weapon_snowball', 1, false, 'qb-inventory:server:snowball') + RemoveItem(source, 'weapon_snowball') end end) @@ -228,8 +265,8 @@ QBCore.Functions.CreateCallback('qb-inventory:server:createDrop', function(sourc end local playerPed = GetPlayerPed(src) local playerCoords = GetEntityCoords(playerPed) - if RemoveItem(src, item.name, item.amount, item.fromSlot, 'dropped item') then - if item.type == 'weapon' then checkWeapon(src, item) end + if RemoveItem(src, item.name, item.amount, item.fromSlot) then + if item.type == 'weapon' then SetCurrentPedWeapon(playerPed, `WEAPON_UNARMED`, true) end TaskPlayAnim(playerPed, 'pickup_object', 'pickup_low', 8.0, -8.0, 2000, 0, 0, false, false, false) local bag = CreateObjectNoOffset(Config.ItemDropObject, playerCoords.x + 0.5, playerCoords.y + 0.5, playerCoords.z, true, true, false) local dropId = NetworkGetNetworkIdFromEntity(bag) @@ -341,7 +378,7 @@ QBCore.Functions.CreateCallback('qb-inventory:server:giveItem', function(source, return end - if itemInfo.type == 'weapon' then checkWeapon(source, item) end + if itemInfo.type == 'weapon' then SetCurrentPedWeapon(playerPed, `WEAPON_UNARMED`, true) end TriggerClientEvent('qb-inventory:client:giveAnim', source) TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'remove', giveAmount) TriggerClientEvent('qb-inventory:client:giveAnim', target) @@ -394,7 +431,6 @@ RegisterNetEvent('qb-inventory:server:SetInventoryData', function(fromInventory, if fromItem then if not toItem and toAmount > fromItem.amount then return end - if fromInventory == 'player' and toInventory ~= 'player' then checkWeapon(src, fromItem) end local fromId = getIdentifier(fromInventory, src) local toId = getIdentifier(toInventory, src) From c8baa90f558732648e3f8656b271c55522ff04fa Mon Sep 17 00:00:00 2001 From: Christian J Bennett Date: Thu, 23 May 2024 20:20:19 -0500 Subject: [PATCH 2/3] Updated Background color --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 85ed2bcfb..ebc477067 100644 --- a/server/main.lua +++ b/server/main.lua @@ -174,7 +174,7 @@ RegisterNetEvent('qb-inventory:server:useItem', function(item) local dist = #(playerCoords - GetEntityCoords(targetPed)) if dist < 3.0 then TriggerClientEvent('chat:addMessage', v, { - template = '', + template = '', args = { 'ID Card', item.info.citizenid, @@ -198,7 +198,7 @@ RegisterNetEvent('qb-inventory:server:useItem', function(item) local dist = #(playerCoords - GetEntityCoords(targetPed)) if dist < 3.0 then TriggerClientEvent('chat:addMessage', v, { - template = '', + template = '', args = { 'Drivers License', item.info.firstname, From edb74e68918c9950e62a12dcb5263e6a31c2d7f3 Mon Sep 17 00:00:00 2001 From: Christian J Bennett <58433059+ChristianBDev@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:57:23 -0500 Subject: [PATCH 3/3] Added Background-gradient --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index ebc477067..85ed2bcfb 100644 --- a/server/main.lua +++ b/server/main.lua @@ -174,7 +174,7 @@ RegisterNetEvent('qb-inventory:server:useItem', function(item) local dist = #(playerCoords - GetEntityCoords(targetPed)) if dist < 3.0 then TriggerClientEvent('chat:addMessage', v, { - template = '', + template = '', args = { 'ID Card', item.info.citizenid, @@ -198,7 +198,7 @@ RegisterNetEvent('qb-inventory:server:useItem', function(item) local dist = #(playerCoords - GetEntityCoords(targetPed)) if dist < 3.0 then TriggerClientEvent('chat:addMessage', v, { - template = '', + template = '', args = { 'Drivers License', item.info.firstname,