From 6efd2ba60c58dd943c983c2201ebadab2fe44334 Mon Sep 17 00:00:00 2001 From: telkar-rg Date: Wed, 10 Jan 2024 19:41:59 +0100 Subject: [PATCH] Tooltip Source sould now correctly display differently when logging to a char of the other faction. --- Altoholic-Addon/Altoholic/Core.lua | 2 +- Altoholic-Addon/Altoholic/Loots.lua | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Altoholic-Addon/Altoholic/Core.lua b/Altoholic-Addon/Altoholic/Core.lua index 2b06d3d..c08bfb9 100644 --- a/Altoholic-Addon/Altoholic/Core.lua +++ b/Altoholic-Addon/Altoholic/Core.lua @@ -134,7 +134,7 @@ local AddonDB_Defaults = { WarningType3 = "30|15|10|5|4|3|2|1", -- for calendar events WarningType4 = "30|15|10|5|4|3|2|1", -- for item timers (like mysterious egg) }, - LootSourceTooltip = { version = 0, single={}, multi={}, }, + LootSourceTooltip = { Alliance={db={}, version = 0}, Horde={db={}, version = 0}, }, }, } diff --git a/Altoholic-Addon/Altoholic/Loots.lua b/Altoholic-Addon/Altoholic/Loots.lua index 734cebf..48a6d86 100644 --- a/Altoholic-Addon/Altoholic/Loots.lua +++ b/Altoholic-Addon/Altoholic/Loots.lua @@ -28,7 +28,8 @@ lootTable = addonTable.LootTableSetup.lootTable function ns:setupLootTable() - LootSourceTooltipDB = Altoholic.db.global.LootSourceTooltip + local playerFaction = UnitFactionGroup("player") + LootSourceTooltipDB = Altoholic.db.global.LootSourceTooltip[playerFaction] if not LootSourceTooltipDB.version or LootSourceTooltipDB.version ~= LootSourceTooltip_VERSION then @@ -108,9 +109,9 @@ function ns:setupLootTable() end -- LootSourceTooltip = { version = 0, single={}, multi={}, }, - wipe(LootSourceTooltipDB.multi) - wipe(LootSourceTooltipDB.single) - LootSourceTooltipDB.multi = lootTableRev_Multi + wipe(LootSourceTooltipDB.db) + -- wipe(LootSourceTooltipDB.single) + LootSourceTooltipDB.db = lootTableRev_Multi -- LootSourceTooltipDB.single = lootTableRev_Single LootSourceTooltipDB.version = LootSourceTooltip_VERSION @@ -133,9 +134,10 @@ function ns:GetSource(searchedID) } local txt, domain, subDomain - -- LootSourceTooltipDB.multi - if LootSourceTooltipDB.multi[searchedID] then - txt = LootSourceTooltipDB.multi[searchedID] + -- if LootSourceTooltipDB.multi[searchedID] then + if LootSourceTooltipDB.db[searchedID] then + -- txt = LootSourceTooltipDB.multi[searchedID] + txt = LootSourceTooltipDB.db[searchedID] local p = strfind(txt, "\1\1\1") -- check if multiple zones and take first if p then @@ -166,9 +168,10 @@ function ns:GetSource(searchedID) end function ns:GetSource_multi(searchedID) - -- LootSourceTooltipDB.multi - if LootSourceTooltipDB.multi[searchedID] then - local txt = LootSourceTooltipDB.multi[searchedID] + -- if LootSourceTooltipDB.multi[searchedID] then + if LootSourceTooltipDB.db[searchedID] then + -- local txt = LootSourceTooltipDB.multi[searchedID] + local txt = LootSourceTooltipDB.db[searchedID] txt = gsub(txt, "\1\1\1","; ") txt = gsub(txt, "\1\1","/ ") txt = gsub(txt, "\1",", ") @@ -212,7 +215,8 @@ local function ParseAltoholicLoots(OnMatch, OnNoMatch) local count = 0 -- print("-- DEBUG: CALLED ParseAltoholicLoots(OnMatch, OnNoMatch)") - for itemID, txt in pairs(LootSourceTooltipDB.multi) do + -- for itemID, txt in pairs(LootSourceTooltipDB.multi) do + for itemID, txt in pairs(LootSourceTooltipDB.db) do if not listSearchedID[itemID] then -- search only once listSearchedID[itemID] = 1 @@ -506,7 +510,8 @@ function ns:FindUpgradeByStats(currentID, class) AddCurrentlyEquippedItem(currentID, class) - for itemID, txt in pairs(LootSourceTooltipDB.multi) do + -- for itemID, txt in pairs(LootSourceTooltipDB.multi) do + for itemID, txt in pairs(LootSourceTooltipDB.db) do local matches, itemLevel = MatchUpgradeByStats(itemID)