fix: tooltip inventory
This commit is contained in:
Salikh Gurgenidze
+285
-153
@@ -6,189 +6,321 @@ addon.Modules.Tooltip = Tooltip
|
||||
|
||||
-- Helper function to get item ID from link (Lua 5.0 compatible)
|
||||
local function GetItemIDFromLink(link)
|
||||
if not link then return nil end
|
||||
-- Use strfind instead of string.match
|
||||
local _, _, itemID = strfind(link, "item:(%d+):?")
|
||||
return itemID and tonumber(itemID) or nil
|
||||
if not link then return nil end
|
||||
-- Use strfind instead of string.match
|
||||
local _, _, itemID = strfind(link, "item:(%d+):?")
|
||||
return itemID and tonumber(itemID) or nil
|
||||
end
|
||||
|
||||
-- Count items for a specific character
|
||||
local function CountItemsForCharacter(itemID, characterData)
|
||||
local bagCount = 0
|
||||
local bankCount = 0
|
||||
local bagCount = 0
|
||||
local bankCount = 0
|
||||
|
||||
-- Count bags
|
||||
if characterData.bags then
|
||||
for bagID, bagData in pairs(characterData.bags) do
|
||||
if bagData and bagData.slots then
|
||||
for slotID, itemData in pairs(bagData.slots) do
|
||||
if itemData and itemData.link then
|
||||
local slotItemID = GetItemIDFromLink(itemData.link)
|
||||
if slotItemID == itemID then
|
||||
bagCount = bagCount + (itemData.count or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-- Count bags
|
||||
if characterData.bags then
|
||||
for bagID, bagData in pairs(characterData.bags) do
|
||||
if bagData and bagData.slots then
|
||||
for slotID, itemData in pairs(bagData.slots) do
|
||||
if itemData and itemData.link then
|
||||
local slotItemID = GetItemIDFromLink(itemData.link)
|
||||
if slotItemID == itemID then
|
||||
bagCount = bagCount + (itemData.count or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Count bank
|
||||
if characterData.bank then
|
||||
for bagID, bagData in pairs(characterData.bank) do
|
||||
if bagData and bagData.slots then
|
||||
for slotID, itemData in pairs(bagData.slots) do
|
||||
if itemData and itemData.link then
|
||||
local slotItemID = GetItemIDFromLink(itemData.link)
|
||||
if slotItemID == itemID then
|
||||
bankCount = bankCount + (itemData.count or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-- Count bank
|
||||
if characterData.bank then
|
||||
for bagID, bagData in pairs(characterData.bank) do
|
||||
if bagData and bagData.slots then
|
||||
for slotID, itemData in pairs(bagData.slots) do
|
||||
if itemData and itemData.link then
|
||||
local slotItemID = GetItemIDFromLink(itemData.link)
|
||||
if slotItemID == itemID then
|
||||
bankCount = bankCount + (itemData.count or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return bagCount, bankCount
|
||||
return bagCount, bankCount
|
||||
end
|
||||
|
||||
-- Get class color
|
||||
local function GetClassColor(classToken)
|
||||
if not classToken then return 1.0, 1.0, 1.0 end
|
||||
local color = RAID_CLASS_COLORS[classToken]
|
||||
if color then return color.r, color.g, color.b end
|
||||
return 1.0, 1.0, 1.0
|
||||
if not classToken then return 1.0, 1.0, 1.0 end
|
||||
local color = RAID_CLASS_COLORS[classToken]
|
||||
if color then return color.r, color.g, color.b end
|
||||
return 1.0, 1.0, 1.0
|
||||
end
|
||||
|
||||
-- Add inventory info to tooltip
|
||||
function Tooltip:AddInventoryInfo(tooltip, link)
|
||||
if not Guda_DB or not Guda_DB.characters then
|
||||
addon:Debug("No Guda_DB or characters found")
|
||||
return
|
||||
end
|
||||
|
||||
local itemID = GetItemIDFromLink(link)
|
||||
if not itemID then
|
||||
addon:Debug("Could not get item ID from link: " .. tostring(link))
|
||||
return
|
||||
end
|
||||
|
||||
addon:Debug("Processing item ID: " .. itemID)
|
||||
|
||||
local totalBags = 0
|
||||
local totalBank = 0
|
||||
local characterCounts = {}
|
||||
if not Guda_DB or not Guda_DB.characters then
|
||||
addon:Debug("No Guda_DB or characters found")
|
||||
return
|
||||
end
|
||||
|
||||
-- Count items across all characters
|
||||
for charName, charData in pairs(Guda_DB.characters) do
|
||||
local bagCount, bankCount = CountItemsForCharacter(itemID, charData)
|
||||
if bagCount > 0 or bankCount > 0 then
|
||||
totalBags = totalBags + bagCount
|
||||
totalBank = totalBank + bankCount
|
||||
table.insert(characterCounts, {
|
||||
name = charData.name or charName,
|
||||
classToken = charData.classToken,
|
||||
bagCount = bagCount,
|
||||
bankCount = bankCount
|
||||
})
|
||||
addon:Debug("Found " .. (bagCount + bankCount) .. " items on " .. charName .. " (Bags: " .. bagCount .. ", Bank: " .. bankCount .. ")")
|
||||
end
|
||||
end
|
||||
local itemID = GetItemIDFromLink(link)
|
||||
if not itemID then
|
||||
addon:Debug("Could not get item ID from link: " .. tostring(link))
|
||||
return
|
||||
end
|
||||
|
||||
local totalCount = totalBags + totalBank
|
||||
addon:Debug("Processing item ID: " .. itemID)
|
||||
|
||||
-- Only add to tooltip if we found items
|
||||
if totalCount > 0 then
|
||||
addon:Debug("Adding inventory info - Total: " .. totalCount)
|
||||
local totalBags = 0
|
||||
local totalBank = 0
|
||||
local characterCounts = {}
|
||||
|
||||
tooltip:AddLine(" ")
|
||||
tooltip:AddLine("Inventory", 0.7, 0.7, 0.7)
|
||||
tooltip:AddDoubleLine("Total: " .. totalCount, "(Bags: " .. totalBags .. " | Bank: " .. totalBank .. ")", 1, 1, 1, 0.7, 0.7, 0.7)
|
||||
-- Count items across all characters
|
||||
for charName, charData in pairs(Guda_DB.characters) do
|
||||
local bagCount, bankCount = CountItemsForCharacter(itemID, charData)
|
||||
totalBags = totalBags + bagCount
|
||||
totalBank = totalBank + bankCount
|
||||
table.insert(characterCounts, {
|
||||
name = charData.name or charName,
|
||||
classToken = charData.classToken,
|
||||
bagCount = bagCount,
|
||||
bankCount = bankCount
|
||||
})
|
||||
addon:Debug("Found " .. (bagCount + bankCount) .. " items on " .. charName .. " (Bags: " .. bagCount .. ", Bank: " .. bankCount .. ")")
|
||||
end
|
||||
|
||||
-- Sort characters by name
|
||||
table.sort(characterCounts, function(a, b)
|
||||
return a.name < b.name
|
||||
end)
|
||||
local totalCount = totalBags + totalBank
|
||||
|
||||
-- Add character lines with bag and bank breakdown
|
||||
for _, charInfo in ipairs(characterCounts) do
|
||||
local r, g, b = GetClassColor(charInfo.classToken)
|
||||
local countText = ""
|
||||
if charInfo.bagCount > 0 and charInfo.bankCount > 0 then
|
||||
countText = "Bags: " .. charInfo.bagCount .. " | Bank: " .. charInfo.bankCount
|
||||
elseif charInfo.bagCount > 0 then
|
||||
countText = "Bags: " .. charInfo.bagCount
|
||||
else
|
||||
countText = "Bank: " .. charInfo.bankCount
|
||||
end
|
||||
tooltip:AddDoubleLine(charInfo.name, countText, r, g, b, 0.7, 0.7, 0.7)
|
||||
end
|
||||
-- ALWAYS add to tooltip, even if 0 items
|
||||
addon:Debug("Adding inventory info - Total: " .. totalCount)
|
||||
|
||||
tooltip:Show()
|
||||
else
|
||||
addon:Debug("No items found for ID: " .. itemID)
|
||||
end
|
||||
tooltip:AddLine(" ")
|
||||
tooltip:AddLine("Inventory", 0.7, 0.7, 0.7)
|
||||
tooltip:AddDoubleLine("Total: " .. totalCount, "(Bags: " .. totalBags .. " | Bank: " .. totalBank .. ")", 1, 1, 1, 0.7, 0.7, 0.7)
|
||||
|
||||
-- Sort characters by name
|
||||
table.sort(characterCounts, function(a, b)
|
||||
return a.name < b.name
|
||||
end)
|
||||
|
||||
-- Add character lines with bag and bank breakdown
|
||||
for _, charInfo in ipairs(characterCounts) do
|
||||
local r, g, b = GetClassColor(charInfo.classToken)
|
||||
local countText = ""
|
||||
if charInfo.bagCount > 0 and charInfo.bankCount > 0 then
|
||||
countText = "Bags: " .. charInfo.bagCount .. " | Bank: " .. charInfo.bankCount
|
||||
elseif charInfo.bagCount > 0 then
|
||||
countText = "Bags: " .. charInfo.bagCount
|
||||
else
|
||||
countText = "Bank: " .. charInfo.bankCount
|
||||
end
|
||||
tooltip:AddDoubleLine(charInfo.name, countText, r, g, b, 0.7, 0.7, 0.7)
|
||||
end
|
||||
|
||||
tooltip:Show()
|
||||
end
|
||||
|
||||
function Tooltip:Initialize()
|
||||
addon:Print("Initializing tooltip module...")
|
||||
addon:Print("Initializing tooltip module...")
|
||||
|
||||
-- Hook SetBagItem
|
||||
local oldSetBagItem = GameTooltip.SetBagItem
|
||||
function GameTooltip:SetBagItem(bag, slot)
|
||||
local ret = oldSetBagItem(self, bag, slot)
|
||||
local link = GetContainerItemLink(bag, slot)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
-- Hook SetBagItem
|
||||
local oldSetBagItem = GameTooltip.SetBagItem
|
||||
function GameTooltip:SetBagItem(bag, slot)
|
||||
local ret = oldSetBagItem(self, bag, slot)
|
||||
local link = GetContainerItemLink(bag, slot)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetHyperlink for chat links
|
||||
local oldSetHyperlink = GameTooltip.SetHyperlink
|
||||
function GameTooltip:SetHyperlink(link)
|
||||
local ret = oldSetHyperlink(self, link)
|
||||
if link and strfind(link, "item:") then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
-- Hook SetHyperlink for chat links
|
||||
local oldSetHyperlink = GameTooltip.SetHyperlink
|
||||
function GameTooltip:SetHyperlink(link)
|
||||
local ret = oldSetHyperlink(self, link)
|
||||
if link and strfind(link, "item:") then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetInventoryItem for character paperdoll
|
||||
local oldSetInventoryItem = GameTooltip.SetInventoryItem
|
||||
function GameTooltip:SetInventoryItem(unit, slot)
|
||||
local ret = oldSetInventoryItem(self, unit, slot)
|
||||
local link = GetInventoryItemLink(unit, slot)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
-- Hook SetInventoryItem for character paperdoll
|
||||
local oldSetInventoryItem = GameTooltip.SetInventoryItem
|
||||
function GameTooltip:SetInventoryItem(unit, slot)
|
||||
local ret = oldSetInventoryItem(self, unit, slot)
|
||||
local link = GetInventoryItemLink(unit, slot)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Also hook ItemRefTooltip for chat links
|
||||
if ItemRefTooltip then
|
||||
local oldItemRefSetHyperlink = ItemRefTooltip.SetHyperlink
|
||||
function ItemRefTooltip:SetHyperlink(link)
|
||||
oldItemRefSetHyperlink(self, link)
|
||||
if link and strfind(link, "item:") then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
end
|
||||
end
|
||||
-- Hook SetLootItem for loot windows
|
||||
local oldSetLootItem = GameTooltip.SetLootItem
|
||||
function GameTooltip:SetLootItem(slot)
|
||||
local ret = oldSetLootItem(self, slot)
|
||||
local link = GetLootSlotLink(slot)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Clear cache function
|
||||
function Tooltip:ClearCache()
|
||||
addon:Debug("Tooltip cache cleared")
|
||||
end
|
||||
-- Hook SetQuestItem for quest rewards
|
||||
local oldSetQuestItem = GameTooltip.SetQuestItem
|
||||
function GameTooltip:SetQuestItem(itemType, index)
|
||||
local ret = oldSetQuestItem(self, itemType, index)
|
||||
local link = GetQuestItemLink(itemType, index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Clear cache on bag updates
|
||||
local frame = CreateFrame("Frame")
|
||||
frame:RegisterEvent("BAG_UPDATE")
|
||||
frame:SetScript("OnEvent", function()
|
||||
if event == "BAG_UPDATE" then
|
||||
Tooltip:ClearCache()
|
||||
end
|
||||
end)
|
||||
-- Hook SetQuestLogItem for quest log items
|
||||
local oldSetQuestLogItem = GameTooltip.SetQuestLogItem
|
||||
function GameTooltip:SetQuestLogItem(itemType, index)
|
||||
local ret = oldSetQuestLogItem(self, itemType, index)
|
||||
local link = GetQuestLogItemLink(itemType, index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
addon:Print("Tooltip item-count integration enabled")
|
||||
-- Hook SetTradeSkillItem for tradeskill windows
|
||||
local oldSetTradeSkillItem = GameTooltip.SetTradeSkillItem
|
||||
function GameTooltip:SetTradeSkillItem(skillIndex, reagentIndex)
|
||||
local ret = oldSetTradeSkillItem(self, skillIndex, reagentIndex)
|
||||
local link
|
||||
if reagentIndex then
|
||||
link = GetTradeSkillReagentItemLink(skillIndex, reagentIndex)
|
||||
else
|
||||
link = GetTradeSkillItemLink(skillIndex)
|
||||
end
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetCraftItem for craft windows
|
||||
local oldSetCraftItem = GameTooltip.SetCraftItem
|
||||
function GameTooltip:SetCraftItem(skillIndex, reagentIndex)
|
||||
local ret = oldSetCraftItem(self, skillIndex, reagentIndex)
|
||||
local link = GetCraftReagentItemLink(skillIndex, reagentIndex)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetAuctionItem for auction house
|
||||
local oldSetAuctionItem = GameTooltip.SetAuctionItem
|
||||
function GameTooltip:SetAuctionItem(type, index)
|
||||
local ret = oldSetAuctionItem(self, type, index)
|
||||
local link = GetAuctionItemLink(type, index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetInboxItem for mail
|
||||
local oldSetInboxItem = GameTooltip.SetInboxItem
|
||||
function GameTooltip:SetInboxItem(index)
|
||||
local ret = oldSetInboxItem(self, index)
|
||||
local link = GetInboxItemLink(index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetSendMailItem for sending mail
|
||||
local oldSetSendMailItem = GameTooltip.SetSendMailItem
|
||||
function GameTooltip:SetSendMailItem(index)
|
||||
local ret = oldSetSendMailItem(self, index)
|
||||
local link = GetSendMailItemLink(index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetMerchantItem for vendor items
|
||||
local oldSetMerchantItem = GameTooltip.SetMerchantItem
|
||||
function GameTooltip:SetMerchantItem(index)
|
||||
local ret = oldSetMerchantItem(self, index)
|
||||
local link = GetMerchantItemLink(index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetBuybackItem for buyback items
|
||||
local oldSetBuybackItem = GameTooltip.SetBuybackItem
|
||||
function GameTooltip:SetBuybackItem(index)
|
||||
local ret = oldSetBuybackItem(self, index)
|
||||
local link = GetBuybackItemLink(index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetTradePlayerItem for trade window (player side)
|
||||
local oldSetTradePlayerItem = GameTooltip.SetTradePlayerItem
|
||||
function GameTooltip:SetTradePlayerItem(index)
|
||||
local ret = oldSetTradePlayerItem(self, index)
|
||||
local link = GetTradePlayerItemLink(index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Hook SetTradeTargetItem for trade window (target side)
|
||||
local oldSetTradeTargetItem = GameTooltip.SetTradeTargetItem
|
||||
function GameTooltip:SetTradeTargetItem(index)
|
||||
local ret = oldSetTradeTargetItem(self, index)
|
||||
local link = GetTradeTargetItemLink(index)
|
||||
if link then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- Also hook ItemRefTooltip for chat links
|
||||
if ItemRefTooltip then
|
||||
local oldItemRefSetHyperlink = ItemRefTooltip.SetHyperlink
|
||||
function ItemRefTooltip:SetHyperlink(link)
|
||||
local ret = oldItemRefSetHyperlink(self, link)
|
||||
if link and strfind(link, "item:") then
|
||||
Tooltip:AddInventoryInfo(self, link)
|
||||
end
|
||||
return ret
|
||||
end
|
||||
end
|
||||
|
||||
-- Clear cache function
|
||||
function Tooltip:ClearCache()
|
||||
addon:Debug("Tooltip cache cleared")
|
||||
end
|
||||
|
||||
-- Clear cache on bag updates
|
||||
local frame = CreateFrame("Frame")
|
||||
frame:RegisterEvent("BAG_UPDATE")
|
||||
frame:SetScript("OnEvent", function()
|
||||
if event == "BAG_UPDATE" then
|
||||
Tooltip:ClearCache()
|
||||
end
|
||||
end)
|
||||
|
||||
addon:Print("Tooltip item-count integration enabled")
|
||||
end
|
||||
Reference in New Issue
Block a user