wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 581:78e9cbbf3d58 11.0.2-1

Updated for Patch 11.0.2 changes.

author	MMOSimca
date	Tue, 20 Aug 2024 09:42:51 -0400
parents	89fab01eaba0
children

comparison

equal deleted inserted replaced

-:211556c5167b
+:78e9cbbf3d58
 local select = _G.select
 local type = _G.type
 local unpack = _G.unpack
 local C_Timer = _G.C_Timer
+local C_Spell = _G.C_Spell
 local GetCurrencyInfo = _G.GetCurrencyInfo
 -- ADDON NAMESPACE ----------------------------------------------------
 local DELAY_PROCESS_WORLD_QUESTS = 90
 local DELAY_UPDATE_TARGET_LOCATION = 0.5
 local ITEM_ID_TIMBER = 114781
-local LOOT_SLOT_CURRENCY = _G.LOOT_SLOT_CURRENCY
+local ENUM_LOOTSLOTTYPE_CURRENCY = _G.Enum.LootSlotType.Currency
-local LOOT_SLOT_ITEM = _G.LOOT_SLOT_ITEM
+local ENUM_LOOTSLOTTYPE_ITEM = _G.Enum.LootSlotType.Item
-local LOOT_SLOT_MONEY = _G.LOOT_SLOT_MONEY
+local ENUM_LOOTSLOTTYPE_MONEY = _G.Enum.LootSlotType.Money
 --local LOOT_SOURCE_ID_UNKNOWN = 1 -- Technically unused right now, but has future use potential
 --local LOOT_SOURCE_ID_REDUNDANT = 3 -- Technically unused right now, but has future use potential
 local LOOT_SOURCE_ID_GARRISON_CACHE = 10
 CHAT_MSG_MONSTER_WHISPER = "RecordQuote",
 CHAT_MSG_MONSTER_YELL = "RecordQuote",
 CHAT_MSG_SYSTEM = true,
 COMBAT_LOG_EVENT_UNFILTERED = true,
 COMBAT_TEXT_UPDATE = true,
-CURSOR_UPDATE = true,
+WORLD_CURSOR_TOOLTIP_UPDATE = true,
 GARRISON_MISSION_NPC_CLOSED = "ResumeChatLootRecording",
 GARRISON_MISSION_NPC_OPENED = "StopChatLootRecording",
 GARRISON_SHIPYARD_NPC_CLOSED = "ResumeChatLootRecording",
 GARRISON_SHIPYARD_NPC_OPENED = "StopChatLootRecording",
 GOSSIP_CLOSED = "ResumeChatLootRecording",
 GUILDBANKFRAME_CLOSED = "ResumeChatLootRecording",
 GUILDBANKFRAME_OPENED = true, -- also triggers StopChatLootRecording
 ISLAND_AZERITE_GAIN = true,
 ISLAND_COMPLETED = true,
 ITEM_TEXT_BEGIN = true,
-ITEM_UPGRADE_MASTER_OPENED = true,
 LOOT_CLOSED = true,
 LOOT_OPENED = true,
 LOOT_SLOT_CLEARED = "HandleBadChatLootData",
 MAIL_CLOSED = "ResumeChatLootRecording",
 MAIL_SHOW = true, -- also triggers StopChatLootRecording
 SHOW_LOOT_TOAST = true,
 SPELL_CONFIRMATION_PROMPT = true,
 TAXIMAP_OPENED = true,
 TRADE_CLOSED = "ResumeChatLootRecording",
 TRADE_SHOW = "StopChatLootRecording",
-TRADE_SKILL_SHOW = true,
+--TRADE_SKILL_SHOW = true,
-TRAINER_CLOSED = true,
+--TRAINER_CLOSED = true,
-TRAINER_SHOW = true,
+--TRAINER_SHOW = true,
-TRANSMOGRIFY_OPEN = true,
 UNIT_PET = true,
 UNIT_QUEST_LOG_CHANGED = true,
 UNIT_SPELLCAST_FAILED = "HandleSpellFailure",
 UNIT_SPELLCAST_FAILED_QUIET = "HandleSpellFailure",
 UNIT_SPELLCAST_INTERRUPTED = "HandleSpellFailure",
 UNIT_SPELLCAST_SENT = true,
 UNIT_SPELLCAST_SUCCEEDED = true,
-VOID_STORAGE_OPEN = true,
+PLAYER_INTERACTION_MANAGER_FRAME_SHOW = true,
 }
 -- VARIABLES ----------------------------------------------------------
 end
 local item_id = ItemLinkToID(item_link)
 if not bag_index or not slot_index then
 for new_bag_index = 0, _G.NUM_BAG_FRAMES do
-for new_slot_index = 1, _G.GetContainerNumSlots(new_bag_index) do
+for new_slot_index = 1, _G.C_Container.GetContainerNumSlots(new_bag_index) do
-if item_id == ItemLinkToID(_G.GetContainerItemLink(new_bag_index, new_slot_index)) then
+if item_id == ItemLinkToID(_G.C_Container.GetContainerItemLink(new_bag_index, new_slot_index)) then
 bag_index = new_bag_index
 slot_index = new_slot_index
 break
 end
 end
 local any_loot = false
 -- Check if Blizzard has marked this item as officially having a chance of containing loot
 if bag_index and slot_index then
-local _, _, _, _, _, is_lootable = _G.GetContainerItemInfo(bag_index, slot_index)
+local _, _, _, _, _, is_lootable = _G.C_Container.GetContainerItemInfo(bag_index, slot_index)
 if is_lootable then
 any_loot = true
 end
 end
 end
 function UpdateFactionData()
 for faction_index = 1, MAX_FACTION_INDEX do
-local faction_name, _, current_standing, _, _, _, _, _, is_header = _G.GetFactionInfo(faction_index)
+local faction_table = _G.C_Reputation.GetFactionDataByIndex(faction_index)
-if faction_name then
+			if faction_table then
-faction_standings[faction_name] = STANDING_NAMES[current_standing]
+				if faction_table.name then
-elseif not faction_name then
+					faction_standings[faction_table.name] = STANDING_NAMES[faction_table.currentStanding]
-break
+				elseif not faction_table.name then
-end
+					break
+				end
+			end
 end
 end
 end -- do-block
 -- These timers loop indefinitely using Lua's infinity constant
 item_process_timer_handle = C_Timer.NewTicker(DELAY_PROCESS_ITEMS, WDP.ProcessItems, nil)
 target_location_timer_handle = C_Timer.NewTicker(DELAY_UPDATE_TARGET_LOCATION, WDP.UpdateTargetLocation, nil)
 world_quest_timer_handle = C_Timer.NewTicker(DELAY_PROCESS_WORLD_QUESTS, WDP.ProcessWorldQuests, nil)
-_G.hooksecurefunc("UseContainerItem", function(bag_index, slot_index, target_unit)
+_G.hooksecurefunc(C_Container, "UseContainerItem", function(bag_index, slot_index, target_unit)
 if target_unit then
 return
 end
-HandleItemUse(_G.GetContainerItemLink(bag_index, slot_index), bag_index, slot_index)
+HandleItemUse(_G.C_Container.GetContainerItemLink(bag_index, slot_index), bag_index, slot_index)
 end)
 _G.hooksecurefunc("UseItemByName", function(identifier, target_unit)
 if target_unit then
 return
 RecordItemData(item_id, _G.GetInventoryItemLink("player", slot_index), false, max_durability)
 end
 end
 for bag_index = 0, _G.NUM_BAG_SLOTS do
-for slot_index = 1, _G.GetContainerNumSlots(bag_index) do
+for slot_index = 1, _G.C_Container.GetContainerNumSlots(bag_index) do
-local item_id = _G.GetContainerItemID(bag_index, slot_index)
+local item_id = _G.C_Container.GetContainerItemID(bag_index, slot_index)
 if item_id and item_id > 0 then
-local _, max_durability = _G.GetContainerItemDurability(bag_index, slot_index)
+local _, max_durability = _G.C_Container.GetContainerItemDurability(bag_index, slot_index)
-RecordItemData(item_id, _G.GetContainerItemLink(bag_index, slot_index), false, max_durability)
+RecordItemData(item_id, _G.C_Container.GetContainerItemLink(bag_index, slot_index), false, max_durability)
 end
 end
 end
 end
 end
 -- Determine faction ID
 local faction_ID
 for pseudo_faction_name, faction_data_table in pairs(private.FACTION_DATA) do
-if faction_name == faction_data_table[3] then
+if faction_data_table[3] and faction_data_table[3].currentStanding and faction_name == faction_data_table[3].currentStanding then
 -- Check ignore flag
 if faction_data_table[2] then
 return
 end
 faction_ID = faction_data_table[1]
 break
 end
 end
 if faction_ID and faction_ID > 0 then
 -- Check for modifiers from Commendations (applied directly to the faction, account-wide)
-local _, _, _, _, _, _, _, _, _, _, _, _, _, _, has_bonus_rep_gain = GetFactionInfoByID(faction_ID)
+local factionReturn = _G.C_Reputation.GetFactionDataByID(faction_ID)
-if has_bonus_rep_gain then
+if factionReturn and factionReturn.hasBonusRepGain then
 modifier = modifier + 1
 end
 end
 -- Check for modifiers from buffs
 npc.reputations[("%s:%s"):format(faction_name, faction_standings[faction_name])] = math.floor(amount / modifier)
 end
 end -- do-block
-function WDP:CURSOR_UPDATE(event_name)
+function WDP:WORLD_CURSOR_TOOLTIP_UPDATE(event_name, is_shown)
 if current_action.fishing_target or _G.Minimap:IsMouseOver() then
 return
 end
 local text = _G["GameTooltipTextLeft1"]:GetText()
 -- Item containers can be AOE-looted in Patch 5.4.2 if the user clicks fast enough, but this verification still works as long as they both have loot.
 [AF.ITEM] = function()
 local locked_item_id
 for bag_index = 0, _G.NUM_BAG_FRAMES do
-for slot_index = 1, _G.GetContainerNumSlots(bag_index) do
+for slot_index = 1, _G.C_Container.GetContainerNumSlots(bag_index) do
-local _, _, is_locked, _, _, is_lootable = _G.GetContainerItemInfo(bag_index, slot_index)
+local _, _, is_locked, _, _, is_lootable = _G.C_Container.GetContainerItemInfo(bag_index, slot_index)
 if is_locked and is_lootable then
-locked_item_id = ItemLinkToID(_G.GetContainerItemLink(bag_index, slot_index))
+locked_item_id = ItemLinkToID(_G.C_Container.GetContainerItemLink(bag_index, slot_index))
 break
 end
 end
 if locked_item_id then
 InitializeCurrentLoot()
 loot_guid_registry[current_loot.label] = loot_guid_registry[current_loot.label] or {}
 for loot_slot = 1, _G.GetNumLootItems() do
-local texture_filedata_id, item_text, slot_quantity, quality, locked = _G.GetLootSlotInfo(loot_slot)
+local texture_filedata_id, item_text, slot_quantity, _, 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.
 loot_quantity = slot_quantity
 end
 local source_type, source_id = ParseGUID(source_guid)
 local source_key = ("%s:%d"):format(source_type, source_id)
-if slot_type == LOOT_SLOT_ITEM then
+if slot_type == ENUM_LOOTSLOTTYPE_ITEM then
 if loot_link then
 local item_id = ItemLinkToID(loot_link)
 Debug("GUID: %s - Type:ID: %s - ItemID: %d - Amount: %d (%d)", loot_info[loot_index], source_key, item_id, loot_info[loot_index + 1], slot_quantity)
 current_loot.sources[source_guid] = current_loot.sources[source_guid] or {}
 current_loot.sources[source_guid][item_id] = (current_loot.sources[source_guid][item_id] or 0) + loot_quantity
 guids_used[source_guid] = true
 else
 Debug("%s: Loot link is nil for loot slot %d of the entity with GUID %s and Type:ID: %s.", event_name, loot_slot, loot_info[loot_index], source_key)
 end
-elseif slot_type == LOOT_SLOT_MONEY then
+elseif slot_type == ENUM_LOOTSLOTTYPE_MONEY then
 Debug("GUID: %s - Type:ID: %s - Money - Amount: %d (%d)", loot_info[loot_index], source_key, loot_info[loot_index + 1], slot_quantity)
 if current_loot.target_type == AF.ZONE then
 table.insert(current_loot.list, ("money:%d"):format(loot_quantity))
 else
 current_loot.sources[source_guid] = current_loot.sources[source_guid] or {}
 current_loot.sources[source_guid]["money"] = (current_loot.sources[source_guid]["money"] or 0) + loot_quantity
 guids_used[source_guid] = true
 end
-elseif slot_type == LOOT_SLOT_CURRENCY then
+elseif slot_type == ENUM_LOOTSLOTTYPE_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 currency_id = CurrencyLinkToID(loot_link)
 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
 guids_used[source_guid] = true
 end
 else
 Debug("%s: Loot link is nil for loot slot %d of the entity with GUID %s and Type:ID: %s.", event_name, loot_slot, loot_info[loot_index], source_key)
 end
+						else
+Debug("Unknown LootSlotType %d. GUID: %s - Type:ID: %s - Loot Slot: %d - Loot Link: %s", slot_type, loot_info[loot_index], source_key, loot_slot, loot_link or "")
 end
 else
 -- If this is nil, then the item's quantity could be wrong if loot_quantity is wrong, so we won't process this slot's loot.
 Debug("%s: Slot quantity is nil for loot slot %d of the entity with GUID %s and Type:ID: %s.", event_name, loot_slot, loot_info[loot_index], source_key)
 end
 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 texture_id, amount_required, hyperlink, name = _G.GetMerchantItemCostItem(item_index, cost_index)
--- Try to get item ID
+						if hyperlink then
-local item_id = ItemLinkToID(hyperlink)
+							-- Try to get item ID
+							local item_id = ItemLinkToID(hyperlink)
--- FUTURE: At some point, we should make the output from these two cases (item_id vs currency_id) slightly different, so that WoWDB doesn't have to guess if it is a currency or item
--- Handle cases when the additional cost is another item
+							-- FUTURE: At some point, we should make the output from these two cases (item_id vs currency_id) slightly different, so that WoWDB doesn't have to guess if it is a currency or item
-if item_id and item_id > 0 then
+							-- Handle cases when the additional cost is another item
-currency_list[#currency_list + 1] = ("(%s:%d)"):format(amount_required, item_id)
+							if item_id and item_id > 0 then
-else
+								currency_list[#currency_list + 1] = ("(%s:%d)"):format(amount_required, item_id)
--- Try to get currency ID
+							else
-local currency_id = CurrencyLinkToID(hyperlink)
+								-- Try to get currency ID
-if currency_id and currency_id > 0 then
+								local currency_id = CurrencyLinkToID(hyperlink)
-currency_list[#currency_list + 1] = ("(%s:%d)"):format(amount_required, currency_id)
+								if currency_id and currency_id > 0 then
-else
+									currency_list[#currency_list + 1] = ("(%s:%d)"):format(amount_required, currency_id)
-Debug("UpdateMerchantItems: Failed to get item ID and failed to get currency ID for item index %d and cost index %d", item_index, cost_index)
+								else
-end
+									Debug("UpdateMerchantItems: Failed to get item ID and failed to get currency ID for item index %d and cost index %d with hyperlink %s", item_index, cost_index, hyperlink)
-end
+								end
+							end
+						end
 end
 for currency_index = 1, #currency_list do
 price_string = ("%s:%s"):format(price_string, currency_list[currency_index])
 end
 end
 end -- do-block
 function WDP:QUEST_LOG_UPDATE(event_name)
-local selected_quest = _G.GetQuestLogSelection() -- Save current selection to be restored when we're done.
+local selected_quest = _G.C_QuestLog.GetSelectedQuest() -- Save current selection to be restored when we're done.
 local entry_index, processed_quests = 1, 0
-local _, num_quests = _G.GetNumQuestLogEntries()
+local _, num_quests = _G.C_QuestLog.GetNumQuestLogEntries()
 while processed_quests <= num_quests do
-local _, _, _, is_header, _, _, _, quest_id = _G.GetQuestLogTitle(entry_index)
+local info = _G.C_QuestLog.GetInfo(entry_index)
-if quest_id == 0 then
+if info.questID == 0 then
 processed_quests = processed_quests + 1
-elseif not is_header then
+elseif not info.isHeader then
-_G.SelectQuestLogEntry(entry_index);
+_G.C_QuestLog.SetSelectedQuest(entry_index);
-local quest = DBEntry("quests", quest_id)
+local quest = DBEntry("quests", info.questID)
 quest.timer = _G.GetQuestLogTimeLeft()
-quest.can_share = _G.GetQuestLogPushable() and true or nil
+quest.can_share = _G.C_QuestLog.IsPushableQuest(info.questID) and true or nil
 processed_quests = processed_quests + 1
 end
 entry_index = entry_index + 1
 end
-_G.SelectQuestLogEntry(selected_quest)
+_G.C_QuestLog.SetSelectedQuest(selected_quest)
 self:UnregisterEvent("QUEST_LOG_UPDATE")
 end
 function WDP:QUEST_PROGRESS(event_name)
 end
 self:RegisterEvent("QUEST_LOG_UPDATE")
 end
+-- This functionality is broken and should be rethought entirely in the wake of 10.0
+--[[
 do
 local TRADESKILL_TOOLS = {
 Anvil = anvil_spell_ids,
 Forge = forge_spell_ids,
 }
 -- Reset the filters to what they were before
 _G.SetTrainerServiceTypeFilter("available", available or 0)
 _G.SetTrainerServiceTypeFilter("unavailable", unavailable or 0)
 _G.SetTrainerServiceTypeFilter("used", used or 0)
 end
+]]--
 function WDP:UNIT_SPELLCAST_SENT(event_name, unit_id, spell_name, spell_rank, target_name, spell_line)
 if private.tracked_line or unit_id ~= "player" then
 return
 WDP:StopChatLootRecording(event_name)
 SetUnitField("auctioneer", private.UNIT_TYPES.NPC)
 end
+	-- manager_frame_id is 4 in case we need to merge this into that event
 function WDP:BANKFRAME_OPENED(event_name)
 WDP:StopChatLootRecording(event_name)
 SetUnitField("banker", private.UNIT_TYPES.NPC)
 end
 end
 local GOSSIP_SHOW_FUNCS = {
 [private.UNIT_TYPES.NPC] = function(unit_idnum)
-local gossip_options = { _G.GetGossipOptions() }
+local gossip_options = { _G.C_GossipInfo.GetOptions() }
 for index = 2, #gossip_options, 2 do
 if gossip_options[index] == "binder" then
 SetUnitField("innkeeper", private.UNIT_TYPES.NPC)
 return
 UpdateDBEntryLocation("objects", unit_idnum)
 end,
 }
+	-- manager_frame_id is 3 in case we need to merge this into that event
 function WDP:GOSSIP_SHOW(event_name)
 WDP:StopChatLootRecording(event_name)
 local unit_type, unit_idnum = ParseGUID(_G.UnitGUID("npc"))
 if not unit_idnum then
 return
 GOSSIP_SHOW_FUNCS[unit_type](unit_idnum)
 end
 end
+	-- manager_frame_id is 10 in case we need to merge this into that event
 function WDP:GUILDBANKFRAME_OPENED(event_name)
 WDP:StopChatLootRecording(event_name)
 SetUnitField("guild_bank", private.UNIT_TYPES.OBJECT)
 end
-function WDP:ITEM_UPGRADE_MASTER_OPENED(event_name)
+	-- manager_frame_id is 6 in case we need to merge this into that event
-SetUnitField("item_upgrade_master", private.UNIT_TYPES.NPC)
-end
 function WDP:TAXIMAP_OPENED(event_name)
 SetUnitField("flight_master", private.UNIT_TYPES.NPC)
 end
-function WDP:TRANSMOGRIFY_OPEN(event_name)
+function WDP:PLAYER_INTERACTION_MANAGER_FRAME_SHOW(event_name, manager_frame_id)
-SetUnitField("transmogrifier", private.UNIT_TYPES.NPC)
+		if not manager_frame_id then
-end
+			return
+		elseif manager_frame_id == 24 then
+			SetUnitField("transmogrifier", private.UNIT_TYPES.NPC)
-function WDP:VOID_STORAGE_OPEN(event_name)
+		elseif manager_frame_id == 26 then
-SetUnitField("void_storage", private.UNIT_TYPES.NPC)
+			WDP:StopChatLootRecording(event_name)
+			SetUnitField("void_storage", private.UNIT_TYPES.NPC)
+		elseif manager_frame_id == 53 then
+			WDP:StopChatLootRecording(event_name)
+			SetUnitField("item_upgrade_master", private.UNIT_TYPES.NPC)
+		end
 end
 end -- do-block

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 581:78e9cbbf3d58 11.0.2-1