mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-19 06:46:04 +01:00
Rewrite + Optimize hasItem() & stashhasItem()
This commit is contained in:
Jim Shield
GitHub
221
crafting.lua
221
crafting.lua
@@ -225,149 +225,66 @@ function openShop(data)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Client & Server side
|
-- Client & Server side
|
||||||
function hasItem(items, amount, src) local amount, count = amount and amount or 1, 0
|
function hasItem(items, amount, src) local amount = amount and amount or 1
|
||||||
if src then
|
local grabInv = nil
|
||||||
if GetResourceState(OXInv):find("start") then
|
local foundInv = ""
|
||||||
local item = exports[OXInv]:GetItem(src, items)
|
if type(items) ~= "table" then items = { [items] = amount and amount or 1, } end
|
||||||
local amount = (amount or 1)
|
if GetResourceState(OXInv):find("start") then
|
||||||
if item.count >= amount then
|
foundInv = OXInv
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..item.count.."^7/^3"..amount.." "..tostring(items)) end
|
if src then grabInv = exports.ox_inventory:GetInventoryItems(src)
|
||||||
return true
|
else grabInv = exports[OXInv]:GetPlayerItems()
|
||||||
else if Config.System.Debug then
|
|
||||||
print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif GetResourceState(QSInv):find("start") then
|
|
||||||
for _, itemData in pairs(exports[QSInv]:GetInventory(src)) do
|
|
||||||
if itemData and (itemData.name == items) then
|
|
||||||
--if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
|
|
||||||
count += (itemData.amount or 1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if count >= amount then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
|
|
||||||
return true
|
|
||||||
else
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif GetResourceState(CoreInv):find("start") then
|
|
||||||
local item = exports[CoreInv]:getItems('primary-'..src, items)
|
|
||||||
|
|
||||||
if item.amount >= amount then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..item.amount.."^7/^3"..amount.." "..tostring(items)) end
|
|
||||||
return true
|
|
||||||
else if Config.System.Debug then
|
|
||||||
print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif GetResourceState(CodeMInv):find("start") then
|
|
||||||
local success = exports["codem-inventory"]:CheckItemValid(src, items, amount)
|
|
||||||
if success then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..amount.." "..tostring(items)) end
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif GetResourceState(CodeMInv):find("start") then
|
|
||||||
for _, itemData in pairs(exports[CodeMInv]:GetUserInventory(src)) do
|
|
||||||
if itemData and (itemData.name == items) then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
|
|
||||||
count += (itemData.amount or 1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if count >= amount then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
|
|
||||||
return true
|
|
||||||
else
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
else
|
|
||||||
for _, itemData in pairs(Core.Functions.GetPlayer(src).PlayerData.items) do
|
|
||||||
if itemData and (itemData.name == items) then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
|
|
||||||
count += (itemData.amount or 1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if count >= amount then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
|
|
||||||
return true
|
|
||||||
else
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
elseif GetResourceState(QSInv):find("start") then
|
||||||
|
foundInv = QSInv
|
||||||
|
if src then grabInv = exports[QSInv]:GetInventory(src)
|
||||||
|
else grabInv = exports[QSInv]:getUserInventory()
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif GetResourceState(CoreInv):find("start") then
|
||||||
|
foundInv = CoreInv
|
||||||
|
if src then grabInv = exports['core_inventory']:getInventory('primary-'..src)
|
||||||
|
else grabInv = exports[CoreInv]:getInventory('primary-'..GetPlayerServerId(PlayerPedId()))
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif GetResourceState(CodeMInv):find("start") then
|
||||||
|
foundInv = CodeMInv
|
||||||
|
if src then grabInv = exports[CodeMInv]:GetUserInventory(src)
|
||||||
|
else grabInv = exports[CodeMInv]:GetClientPlayerInventory()
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif GetResourceState(QBInv):find("start") then
|
||||||
|
foundInv = QBInv
|
||||||
|
if src then grabInv = Core.Functions.GetPlayer(src).PlayerData.items
|
||||||
|
else grabInv = Core.Functions.GetPlayerData().items
|
||||||
|
end
|
||||||
|
|
||||||
else
|
else
|
||||||
if GetResourceState(OXInv):find("start") then
|
print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
|
||||||
local count = tonumber(exports[OXInv]:Search('count', items))
|
end
|
||||||
local amount = (amount or 1)
|
|
||||||
if count >= amount then if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end return true
|
|
||||||
else if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end return false end
|
|
||||||
|
|
||||||
elseif GetResourceState(QSInv):find("start") then
|
if grabInv then
|
||||||
for _, itemData in pairs(exports[QSInv]:getUserInventory()) do
|
local hasTable = {}
|
||||||
if itemData and (itemData.name == items) then
|
for item, amount in pairs(items) do
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
|
local count = 0
|
||||||
count += (itemData.amount or 1)
|
for _, itemData in pairs(grabInv) do
|
||||||
|
if itemData and (itemData.name == item) then
|
||||||
|
--if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(item).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.count or itemData.amount).."^7)", foundInv) end
|
||||||
|
count += ((itemData.count or itemData.amount) or 1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if count >= amount then
|
if count >= amount then
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
|
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(item).."^7", foundInv) end
|
||||||
return true
|
hasTable[item] = { hasItem = true, count = count, }
|
||||||
else
|
else
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
|
if Config.System.Debug then
|
||||||
return false
|
print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(item).." ^1NOT FOUND^7", foundInv)
|
||||||
end
|
|
||||||
|
|
||||||
elseif GetResourceState(CoreInv):find("start") then
|
|
||||||
for _, itemData in pairs(exports[CoreInv]:getInventory('primary-'..GetPlayerServerId(PlayerPedId()))) do
|
|
||||||
if itemData and (itemData.name == items) then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
|
|
||||||
count += (itemData.amount or 1)
|
|
||||||
end
|
end
|
||||||
|
hasTable[item] = { hasItem = false, count = count, }
|
||||||
end
|
end
|
||||||
if count >= amount then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
|
|
||||||
return true
|
|
||||||
else
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif GetResourceState(CodeMInv):find("start") then
|
|
||||||
local success = exports[CodeMInv]:CheckItemValid(items, amount)
|
|
||||||
if success then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..amount.." "..tostring(items)) end
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif GetResourceState(QBInv):find("start") then
|
|
||||||
--if tonumber(GetResourceMetadata(QBInv, 'version')) <= 1.2 then
|
|
||||||
-- return exports[QBInv]:HasItem(items, amount)
|
|
||||||
--else
|
|
||||||
for _, itemData in pairs(Core.Functions.GetPlayerData().items) do
|
|
||||||
if itemData and (itemData.name == items) then
|
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
|
|
||||||
count += (itemData.amount or 1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if count >= amount then
|
|
||||||
if Config.System.Debug then
|
|
||||||
print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items))
|
|
||||||
end
|
|
||||||
return true
|
|
||||||
else
|
|
||||||
if Config.System.Debug then
|
|
||||||
print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7")
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
-- end
|
|
||||||
end
|
end
|
||||||
|
for k, v in pairs(hasTable) do if v.hasItem == false then return false, hasTable end end
|
||||||
|
return true, hasTable
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -485,22 +402,26 @@ function stashRemoveItem(stashItems, stashName, items) local amount = amount and
|
|||||||
end
|
end
|
||||||
RegisterNetEvent(GetCurrentResourceName()..":server:stashRemoveItem", stashRemoveItem)
|
RegisterNetEvent(GetCurrentResourceName()..":server:stashRemoveItem", stashRemoveItem)
|
||||||
|
|
||||||
function stashhasItem(stashItems, item, amount) local amount, count = amount and amount or 1, 0
|
function stashhasItem(stashItems, items, amount)
|
||||||
for k, itemData in pairs(stashItems) do
|
local foundInv = ""
|
||||||
if itemData and (itemData.name == item) then
|
if type(items) ~= "table" then items = { [items] = amount and amount or 1, } end
|
||||||
--if Config.System.Debug then
|
|
||||||
-- print("^6Bridge^7: ^3stashHasItem^7: ^2Item^7: '^3"..tostring(item).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)")
|
local hasTable = {}
|
||||||
--end
|
for item, amount in pairs(items) do
|
||||||
count += (itemData.amount or 1)
|
local count = 0
|
||||||
end
|
for _, itemData in pairs(stashItems) do
|
||||||
end
|
if itemData and (itemData.name == k) then
|
||||||
if count >= amount then
|
count += (itemData.amount or 1)
|
||||||
if Config.System.Debug then
|
end
|
||||||
print("^6Bridge^7: ^3stashHasItem^7: ^2Items ^3"..item.." ^5FOUND^7 x^3"..count.."^7/^3"..amount.."^7") end
|
end
|
||||||
return
|
if count >= amount then
|
||||||
true
|
if Config.System.Debug then print("^6Bridge^7: ^3stashHasItem^7: ^2Items ^3"..item.." ^5FOUND^7 x^3"..count.."^7/^3"..amount.."^7") end
|
||||||
else
|
hasTable[item] = { hasItem = true, count = count, }
|
||||||
if Config.System.Debug then print("^6Bridge^7: ^3stashHasItem^7: ^2Items ^1NOT FOUND^7 "..json.encode(item)) end
|
else
|
||||||
return false
|
if Config.System.Debug then print("^6Bridge^7: ^3stashHasItem^7: ^2Items ^1NOT FOUND^7 "..json.encode(item)) end
|
||||||
|
hasTable[item] = { hasItem = false, count = count, }
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
for k, v in pairs(hasTable) do if v.hasItem == false then return false, hasTable end end
|
||||||
|
return true, hasTable
|
||||||
end
|
end
|
||||||
Reference in New Issue
Block a user