wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 496:3938b87cfcd3

Radically rewrote currency support for WoWDBProfiler. It now uses currencyIDs everywhere instead of texture paths.

author	MMOSimca <mmosimca@gmail.com>
date	Tue, 11 Oct 2016 06:13:22 -0400
parents	1d1bbcad6563
children	c8a8231c2336

comparison

equal deleted inserted replaced

-:1d1bbcad6563
+:3938b87cfcd3
 local select = _G.select
 local type = _G.type
 local unpack = _G.unpack
 local C_Timer = _G.C_Timer
+local GetCurrencyInfo = _G.GetCurrencyInfo
 -- ADDON NAMESPACE ----------------------------------------------------
 local ADDON_NAME, private = ...
 return math.floor(copper_cost / modifier)
 end
 end -- do-block
+local CurrencyInfoToID
+local PopulateCurrencyInfoLookup
+do
+local MAX_CURRENCY_ID_GAP = 800
+local currency_info_lookup = {}
+function CurrencyInfoToID(name, texture)
+return currency_info_lookup[("%s:%s"):format(name, texture)]
+end
+function PopulateCurrencyInfoLookup()
+local currency_index = 1
+local gap_since_last_currency = 0
+repeat
+-- Store ID by info (name and texture combined)
+local name, _, texture = GetCurrencyInfo(currency_index)
+currency_info_lookup[("%s:%s"):format(name, texture)] = currency_index
+-- If we found nothing, increment gap
+if not name or not texture or (name == "" and texture == "") then
+gap_since_last_currency = gap_since_last_currency + 1
+else
+gap_since_last_currency = 0
+end
+-- Increment loop counter
+currency_index = currency_index + 1
+until (gap_since_last_currency > MAX_CURRENCY_ID_GAP)
+end
+end
 local function InstanceDifficultyToken()
 -- Sometimes, instance information is returned when not in an instance. This check protects against that.
 if _G.IsInInstance() then
 local _, instance_type, instance_difficulty, _, _, _, is_dynamic = _G.GetInstanceInfo()
 return zone_data
 end
 end -- do-block
-local function CurrencyLinkToTexture(currency_link)
+local function CurrencyLinkToID(currency_link)
 if not currency_link then
-return
+return nil
 end
-local _, _, texture_path = _G.GetCurrencyInfo(tonumber(currency_link:match("currency:(%d+)")))
+return tonumber(currency_link:match("currency:(%d+)")) or 0
-return texture_path:match("[^\\]+$"):lower()
+--texture_path:match("[^\\]+$"):lower()
 end
 local function ItemLinkToID(item_link)
 if not item_link then
 for item_id, quantity in pairs(loot_data) do
 table.insert(loot_table, ("%d:%d"):format(item_id, quantity))
 end
 else
 for loot_token, quantity in pairs(loot_data) do
-local label, currency_texture = (":"):split(loot_token)
+local label, currency_id = (":"):split(loot_token)
-if label == "currency" and currency_texture then
+if label == "currency" and currency_id then
-table.insert(loot_table, ("currency:%d:%s"):format(quantity, currency_texture))
+-- Convert currency_id back into number from string
+currency_id = tonumber(currency_id) or 0
+if currency_id ~= 0 then
+table.insert(loot_table, ("currency:%d:%d"):format(quantity, currency_id))
+end
 elseif loot_token == "money" then
 table.insert(loot_table, ("money:%d"):format(quantity))
 else
 table.insert(loot_table, ("%d:%d"):format(loot_token, quantity))
 end
 if entry then
 local loot_table = LootTable(entry, "contains")
 entry["contains_count"] = (entry["contains_count"] or 0) + 1
 for loot_token, quantity in pairs(chat_loot_data.loot) do
-local label, currency_texture = (":"):split(loot_token)
+local label, currency_id = (":"):split(loot_token)
-if label == "currency" and currency_texture then
+if label == "currency" and currency_id then
-table.insert(loot_table, ("currency:%d:%s"):format(quantity, currency_texture))
+-- Convert currency_id back into number from string
+currency_id = tonumber(currency_id) or 0
+if currency_id ~= 0 then
+table.insert(loot_table, ("currency:%d:%d"):format(quantity, currency_id))
+end
 elseif loot_token == "money" then
 table.insert(loot_table, ("money:%d"):format(quantity))
 else
 table.insert(loot_table, ("%d:%d"):format(loot_token, quantity))
 end
 else
 self:RegisterEvent(event_name, (_G.type(mapping) ~= "boolean") and mapping or nil)
 end
 end
+-- Gather known languages
 for index = 1, _G.GetNumLanguages() do
 languages_known[_G.GetLanguageByIndex(index)] = true
 end
+-- Populate currency data from known currency information
+PopulateCurrencyInfoLookup()
 -- These timers loop indefinitely using Lua's infinity constant
 item_process_timer_handle = C_Timer.NewTicker(DELAY_PROCESS_ITEMS, WDP.ProcessItems, math.huge)
 target_location_timer_handle = C_Timer.NewTicker(DELAY_UPDATE_TARGET_LOCATION, WDP.UpdateTargetLocation, math.huge)
 world_quest_timer_handle = C_Timer.NewTicker(DELAY_PROCESS_WORLD_QUESTS, WDP.ProcessWorldQuests, math.huge)
 entry["rewards"]["honor"] = tonumber(_G.GetQuestLogRewardHonor(quest_id)) or 0
 -- Record currencies
 entry["rewards"]["currency_count"] = tonumber(_G.GetNumQuestLogRewardCurrencies(quest_id)) or 0
+-- Create currency rewards sub-table and fill
 if entry["rewards"]["currency_count"] > 0 then
--- Create currency rewards sub-table and fill
 entry["rewards"]["currencies"] = {}
 for i = 1, entry["rewards"]["currency_count"] do
 local name, texture_path, quantity = _G.GetQuestLogRewardCurrencyInfo(i, quest_id)
-local currency_texture = texture_path:match("[^\\]+$"):lower()
+local currency_id = CurrencyInfoToID(name, texture_path)
-table.insert(entry["rewards"]["currencies"], ("%d:%s"):format(quantity, currency_texture))
+table.insert(entry["rewards"]["currencies"], ("%d:%d"):format(quantity, currency_id))
 end
 end
 -- Record items
 entry["rewards"]["item_count"] = tonumber(_G.GetNumQuestLogRewards(quest_id)) or 0
+-- Create item rewards sub-table and fill
 if entry["rewards"]["item_count"] > 0 then
--- Create item rewards sub-table and fill
 entry["rewards"]["items"] = {}
 for i = 1, entry["rewards"]["item_count"] do
 local item_name, item_texture, quantity, quality, is_usable, item_id = _G.GetQuestLogRewardInfo(i, quest_id)
 table.insert(entry["rewards"]["items"], ("%d:%d"):format(item_id, quantity))
 end
 "REVERED",
 "EXALTED",
 }
+-- We should just use IDs here someday; WoWDB site knows all about different power types
 local POWER_TYPE_NAMES = {
 ["0"] = "MANA",
 ["1"] = "RAGE",
 ["2"] = "FOCUS",
 ["3"] = "ENERGY",
 level_data = {}
 encounter_data[npc_level] = level_data
 end
 level_data.max_health = level_data.max_health or _G.UnitHealthMax("target")
+-- May not capture as much data as it could, since the API changed in Legion to report multiple types of power
 if not level_data.power then
 local max_power = _G.UnitPowerMax("target")
 if max_power > 0 then
 local power_type = _G.UnitPowerType("target")
 if loot_source and (loot_source == LOOT_SOURCE_ID_GARRISON_CACHE) and last_garrison_cache_object_id then
 -- Record location data for cache
 UpdateDBEntryLocation("objects", ("OPENING:%d"):format(last_garrison_cache_object_id))
 -- Add drop data
-local currency_texture = CurrencyLinkToTexture(item_link)
+local currency_id = CurrencyLinkToID(item_link)
-if currency_texture and currency_texture ~= "" then
+if currency_id and currency_id ~= 0 then
 -- Check for top level object data
 local object_entry = DBEntry("objects", ("OPENING:%d"):format(last_garrison_cache_object_id))
 local difficulty_token = InstanceDifficultyToken()
 if object_entry[difficulty_token] then
 -- Increment loot count
 object_entry[difficulty_token]["opening_count"] = (object_entry[difficulty_token]["opening_count"] or 0) + 1
-Debug("%s: %s X %d", event_name, currency_texture, quantity)
+Debug("%s: %d X %d", event_name, currency_id, quantity)
 object_entry[difficulty_token]["opening"] = object_entry[difficulty_token]["opening"] or {}
-table.insert(object_entry[difficulty_token]["opening"], ("currency:%d:%s"):format(quantity, currency_texture))
+table.insert(object_entry[difficulty_token]["opening"], ("currency:%d:%d"):format(quantity, currency_id))
 else
 Debug("%s: When handling the Garrison cache, the top level loot data was missing for objectID %d.", event_name, last_garrison_cache_object_id)
 end
 else
-Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
+Debug("%s: Currency ID is nil or 0, from currency link %s", event_name, item_link)
 end
 -- Wipe object ID until future mouseover
 last_garrison_cache_object_id = nil
 elseif raid_boss_id then
 end
 elseif loot_type == "money" then
 Debug("%s: money X %d", event_name, quantity)
 table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
 elseif loot_type == "currency" then
-local currency_texture = CurrencyLinkToTexture(item_link)
+local currency_id = CurrencyLinkToID(item_link)
-if currency_texture and currency_texture ~= "" then
+if currency_id and currency_id ~= 0 then
-Debug("%s: %s X %d", event_name, currency_texture, quantity)
+Debug("%s: %d X %d", event_name, currency_id, quantity)
-table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
+table.insert(encounter_data[loot_label], ("currency:%d:%d"):format(quantity, currency_id))
 else
-Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
+Debug("%s: Currency ID is nil or 0, from currency link %s", event_name, item_link)
 return
 end
 end
 if not boss_loot_toasting[raid_boss_id] then
 end
 elseif loot_type == "money" then
 Debug("%s: money X %d", event_name, quantity)
 current_loot.sources[loot_toast_container_id]["money"] = (current_loot.sources[loot_toast_container_id]["money"] or 0) + quantity
 elseif loot_type == "currency" then
-local currency_texture = CurrencyLinkToTexture(item_link)
+local currency_id = CurrencyLinkToID(item_link)
-if currency_texture and currency_texture ~= "" then
+if currency_id and currency_id ~= 0 then
-Debug("%s: %s X %d", event_name, currency_texture, quantity)
+Debug("%s: %d X %d", event_name, currency_id, quantity)
-local currency_token = ("currency:%s"):format(currency_texture)
+local currency_token = ("currency:%d"):format(currency_id)
 current_loot.sources[loot_toast_container_id][currency_token] = (current_loot.sources[loot_toast_container_id][currency_token] or 0) + quantity
 else
-Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
+Debug("%s: Currency ID is nil or 0, from currency link %s", event_name, item_link)
 current_loot = nil
 return
 end
 end
 current_loot = nil
 container_loot_toasting = true -- Do not count further loots until timer expires or another container is opened
 elseif loot_source and (loot_source == LOOT_SOURCE_ID_REDUNDANT) and chat_loot_timer_handle then
 -- Handle currency loot toasts for chat-based loot (we do this instead of reading currency chat messages because the chat messages are very delayed)
 if loot_type == "currency" then
-local currency_texture = CurrencyLinkToTexture(item_link)
+local currency_id = CurrencyLinkToID(item_link)
-if currency_texture and currency_texture ~= "" then
+if currency_id and currency_id ~= 0 then
 -- Verify that we're still assigning data to the right items
 if chat_loot_data.identifier and (private.CONTAINER_ITEM_ID_LIST[chat_loot_data.identifier] ~= nil) then
-local currency_token = ("currency:%s"):format(currency_texture)
+Debug("%s: Captured currency for chat-based loot recording. %d X %d", event_name, currency_id, quantity)
-Debug("%s: Captured currency for chat-based loot recording. %s X %d", event_name, currency_token, quantity)
+local currency_token = ("currency:%d"):format(currency_id)
 chat_loot_data.loot = chat_loot_data.loot or {}
 chat_loot_data.loot[currency_token] = (chat_loot_data.loot[currency_token] or 0) + quantity
 else -- If not, cancel the timer and wipe the loot table early
 Debug("%s: Canceled chat-based loot recording because we would have assigned the wrong loot!", event_name)
 ClearChatLootData()
 end
 else
-Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
+Debug("%s: Currency ID is nil or 0, from currency link %s", event_name, item_link)
 end
 -- Handle money loot toasts for chat-based loot (we do this instead of reading money chat messages because the chat messages are very delayed)
 elseif loot_type == "money" then
 -- Verify that we're still assigning data to the right items
 if chat_loot_data.identifier and (private.CONTAINER_ITEM_ID_LIST[chat_loot_data.identifier] ~= nil) then
 end
 do
 local CHAT_MSG_CURRENCY_UPDATE_FUNCS = {
-[AF.NPC] = function(currency_texture, quantity)
+[AF.NPC] = function(currency_id, quantity)
-Debug("CHAT_MSG_CURRENCY: AF.NPC currency:%s (%d)", currency_texture, quantity)
+Debug("CHAT_MSG_CURRENCY: AF.NPC currency:%d (%d)", currency_id, quantity)
 end,
-[AF.ZONE] = function(currency_texture, quantity)
+[AF.ZONE] = function(currency_id, quantity)
-local currency_token = ("currency:%s"):format(currency_texture)
+Debug("CHAT_MSG_CURRENCY: AF.ZONE currency:%d (%d)", currency_id, quantity)
-Debug("CHAT_MSG_CURRENCY: AF.ZONE %s (%d)", currency_token, quantity)
 InitializeCurrentLoot()
-current_loot.list[1] = ("%s:%d"):format(currency_token, quantity)
+current_loot.list[1] = ("currency:%d:%d"):format(quantity, currency_id)
 GenericLootUpdate("zones")
 current_loot = nil
 end,
 }
 local currency_link, quantity = deformat(message, _G.CURRENCY_GAINED_MULTIPLE)
 if not currency_link then
 quantity, currency_link = 1, deformat(message, _G.CURRENCY_GAINED)
 end
-local currency_texture = CurrencyLinkToTexture(currency_link)
+local currency_id = CurrencyLinkToID(currency_link)
-if not currency_texture or currency_texture == "" then
+if not currency_id or currency_id == 0 then
 return
 end
 -- Set update category
 if current_action.spell_label == "FISHING" then
 -- Take action based on update category
 local update_func = CHAT_MSG_CURRENCY_UPDATE_FUNCS[category]
 if not category or not update_func then
 return
 end
-update_func(currency_texture, quantity)
+update_func(currency_id, quantity)
 end
 local BLACKLISTED_ITEMS = {
 [114116] = true,
 [213738] = true, -- Taste of Blood (applied by Fate and Fortune, Combat Rogue artifacts)
 [213877] = true, -- Vampiric Aura (used by Nathrezim Invasion bosses and transformed players)
 [215377] = true, -- The Maw Must Feed (applied by Maw of the Damned, Blood Death Knight artifact)
 [224762] = true, -- Leyline Rift (summoned by players with Leyline Mastery in Suramar)
 [225832] = true, -- Nightglow Wisp (cast by players using Wisp in a Bottle toy)
 }
 local function RecordNPCSpell(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, spell_id, spell_name)
 if not spell_id or BLACKLISTED_SPELLS[spell_id] then
 return
 encounter_data.loot_counts[loot_label] = (encounter_data.loot_counts[loot_label] or 0) + 1
 source_list[source_guid] = true
 end
 for loot_token, quantity in pairs(loot_data) do
-local loot_type, currency_texture = (":"):split(loot_token)
+local loot_type, currency_id = (":"):split(loot_token)
-if loot_type == "currency" and currency_texture then
+if loot_type == "currency" and currency_id then
-table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
+-- Convert currency_id back into number from string
+currency_id = tonumber(currency_id) or 0
+if currency_id ~= 0 then
+table.insert(encounter_data[loot_label], ("currency:%d:%d"):format(quantity, currency_id))
+end
 elseif loot_token == "money" then
 table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
 else
 table.insert(encounter_data[loot_label], ("%d:%d"):format(loot_token, quantity))
 end
 InitializeCurrentLoot()
 loot_guid_registry[current_loot.label] = loot_guid_registry[current_loot.label] or {}
 for loot_slot = 1, _G.GetNumLootItems() do
-local texturefiledataID, item_text, slot_quantity, quality, locked = _G.GetLootSlotInfo(loot_slot)
+local texture_filedata_id, item_text, slot_quantity, quality, locked = _G.GetLootSlotInfo(loot_slot)
 local slot_type = _G.GetLootSlotType(loot_slot)
 local loot_info = { _G.GetLootSourceInfo(loot_slot) }
 local loot_link = _G.GetLootSlotLink(loot_slot)
 -- Odd index is GUID, even is count.
 guids_used[source_guid] = true
 end
 elseif slot_type == LOOT_SLOT_CURRENCY then
 -- Same bug with GetLootSlotInfo() will screw up currency when it happens, so we won't process this slot's loot.
 if loot_link then
-local icon_texture = CurrencyLinkToTexture(loot_link)
+local currency_id = CurrencyLinkToID(loot_link)
-Debug("GUID: %s - Type:ID: %s - Currency: %s - Amount: %d (%d)", loot_info[loot_index], source_key, icon_texture, loot_info[loot_index + 1], slot_quantity)
+Debug("GUID: %s - Type:ID: %s - Currency: %d - Amount: %d (%d)", loot_info[loot_index], source_key, currency_id, loot_info[loot_index + 1], slot_quantity)
 if current_loot.target_type == AF.ZONE then
-table.insert(current_loot.list, ("currency:%d:%s"):format(loot_quantity, icon_texture))
+table.insert(current_loot.list, ("currency:%d:%d"):format(loot_quantity, currency_id))
 else
-local currency_token = ("currency:%s"):format(icon_texture)
+local currency_token = ("currency:%d"):format(currency_id)
 current_loot.sources[source_guid] = current_loot.sources[source_guid] or {}
 current_loot.sources[source_guid][currency_token] = (current_loot.sources[source_guid][currency_token] or 0) + loot_quantity
 guids_used[source_guid] = true
 end
 --                    price_string = ("%s:%s:%s:%s"):format(price_string, battleground_rating, personal_rating, required_season_amount or 0)
 price_string = ("%s:%s:%s"):format(price_string, personal_rating, required_season_amount or 0)
 for cost_index = 1, item_count do
 -- The third return (Blizz calls "currency_link") of GetMerchantItemCostItem only returns item links as of Patch 5.3.0.
-local icon_texture, amount_required, item_link = _G.GetMerchantItemCostItem(item_index, cost_index)
+local texture_path, amount_required, item_link, name = _G.GetMerchantItemCostItem(item_index, cost_index)
-local currency_identifier = item_link and ItemLinkToID(item_link) or nil
+-- Try to detect if this is actually a currency by looking for a nil item_link or item ID
-if (not currency_identifier or currency_identifier < 1) and icon_texture then
+local is_item = item_link and ItemLinkToID(item_link)
-currency_identifier = icon_texture:match("[^\\]+$"):lower()
-end
+if not is_item then
+local currency_id = CurrencyInfoToID(name, texture_path)
-if currency_identifier then
+currency_list[#currency_list + 1] = ("(%s:%d)"):format(amount_required, currency_id)
-currency_list[#currency_list + 1] = ("(%s:%s)"):format(amount_required, currency_identifier)
 end
 end
 for currency_index = 1, #currency_list do
 price_string = ("%s:%s"):format(price_string, currency_list[currency_index])
 table.insert(encounter_data[loot_label], ("%d:%d"):format(item_id, quantity))
 elseif loot_type == "money" then
 Debug("%s: Assigned stored money loot data - money:%d", event_name, quantity)
 table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
 elseif loot_type == "currency" then
-local currency_texture = CurrencyLinkToTexture(hyperlink)
+local currency_id = CurrencyLinkToID(hyperlink)
-Debug("%s: Assigned stored currency loot data - %s - currency:%d:%s", event_name, hyperlink, currency_texture, quantity)
+Debug("%s: Assigned stored currency loot data - %s - currency:%d (%d)", event_name, hyperlink, currency_id, quantity)
-table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
+table.insert(encounter_data[loot_label], ("currency:%d:%d"):format(quantity, currency_id))
 end
 end
 if not boss_loot_toasting[raid_boss_id] then
 encounter_data.loot_counts[loot_label] = (encounter_data.loot_counts[loot_label] or 0) + 1

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 496:3938b87cfcd3