From 7cb59a1f7588502de9e124aeef6b39470626066e Mon Sep 17 00:00:00 2001 From: Xruptor Date: Sat, 3 Sep 2016 09:48:59 -0400 Subject: [PATCH] Few fixes before release. -Small fix for guild count showing more then once if guild names are enabled. -Updated the permanent ignore list. Also changed the way how it's processed. (Easier to add stuff now in future) -Cleaned up a typo in new ItemID option. --- BagSync.lua | 14 ++++++++++++-- locale/enUS.lua | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/BagSync.lua b/BagSync.lua index a8538f1..a7176e3 100644 --- a/BagSync.lua +++ b/BagSync.lua @@ -916,9 +916,16 @@ function BSYC:AddItemToTooltip(frame, link) --workaround return end + local permIgnore ={ + [6948] = "Hearthstone", + [110560] = "Garrison Hearthstone", + [140192] = "Dalaran Hearthstone", + [128353] = "Admiral's Compass", + } + --ignore the hearthstone and blacklisted items if shortItemID and tonumber(shortItemID) then - if tonumber(shortItemID) == 6948 or tonumber(shortItemID) == 110560 or tonumber(shortItemID) == 140192 or self.db.blacklist[self.currentRealm][tonumber(shortItemID)] then + if permIgnore[tonumber(shortItemID)] or self.db.blacklist[self.currentRealm][tonumber(shortItemID)] then frame:Show() return end @@ -1010,7 +1017,10 @@ function BSYC:AddItemToTooltip(frame, link) --workaround for q, r in pairs(self.db.guild[v.realm][guildN]) do local dblink, dbcount = strsplit(",", r) if dblink and dblink == itemLink then - allowList["guild"] = allowList["guild"] + (dbcount or 1) + --if we have show guild names then don't show any guild info for the character, otherwise it gets repeated twice + if not self.options.showGuildNames then + allowList["guild"] = allowList["guild"] + (dbcount or 1) + end tmpCount = tmpCount + (dbcount or 1) grandTotal = grandTotal + (dbcount or 1) end diff --git a/locale/enUS.lua b/locale/enUS.lua index 013ace8..e9f812f 100644 --- a/locale/enUS.lua +++ b/locale/enUS.lua @@ -86,7 +86,7 @@ L.DisplayTooltipOnlySearch = "Display BagSync tooltip ONLY in the search window. L.DisplayLineSeperator = "Display empty line seperator." L.DisplayCrossRealm = "Display Cross-Realms characters." L.DisplayBNET = "Display Battle.Net Account characters |cFFDF2B2B(Not Recommended)|r." -L.DisplayItemID = "Display ItemID in tooltip.|r." +L.DisplayItemID = "Display ItemID in tooltip." L.ColorPrimary = "Primary BagSync tooltip color." L.ColorSecondary = "Secondary BagSync tooltip color." L.ColorTotal = "BagSync [Total] tooltip color." -- 1.7.9.5