wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 324:9cc4ffab84d1 5.4.2-1

Miscellaneous fixes.

author	James D. Callahan III <jcallahan@curse.com>
date	Wed, 22 Jan 2014 08:24:08 -0600
parents	901b9cd2a6c2
children	66b136635f6b

comparison

equal deleted inserted replaced

-:901b9cd2a6c2
+:9cc4ffab84d1
 local function ClearKilledBossID()
 if killed_boss_id_timer_handle then
 WDP:CancelTimer(killed_boss_id_timer_handle)
 killed_boss_id_timer_handle = nil
 end
 table.wipe(boss_loot_toasting)
 private.raid_finder_boss_id = nil
 private.world_boss_id = nil
 end
 local function ClearLootToastContainerID()
 if loot_toast_container_timer_handle then
 WDP:CancelTimer(loot_toast_container_timer_handle)
-killed_boss_id_timer_handle = nil
+loot_toast_container_timer_handle = nil
 end
 private.container_loot_toasting = false
 private.loot_toast_container_id = nil
 end
 for line_index = 1, DatamineTT:NumLines() do
 local current_line = _G["WDPDatamineTTTextLeft" .. line_index]
 if not current_line then
-Debug("HandleItemUse: Item with ID %d and link %s did not have a tooltip that contained the string %s.", item_id, item_link, _G.ITEM_OPENABLE)
+Debug("HandleItemUse: Item with ID %d and link %s had an invalid tooltip.", item_id, item_link, _G.ITEM_OPENABLE)
-break
+return
 end
 if current_line:GetText() == _G.ITEM_OPENABLE then
 table.wipe(current_action)
 current_loot = nil
 current_action.target_type = AF.ITEM
 current_action.identifier = item_id
 current_action.loot_label = "contains"
-break
+return
 end
 end
+Debug("HandleItemUse: Item with ID %d and link %s did not have a tooltip that contained the string %s.", item_id, item_link, _G.ITEM_OPENABLE)
 end
 local UnitFactionStanding
 local UpdateFactionData
 end
 do
 local LOOT_OPENED_VERIFY_FUNCS = {
+-- 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
-local _, _, is_locked = _G.GetContainerItemInfo(bag_index, slot_index)
+local _, _, is_locked, _, _, is_lootable = _G.GetContainerItemInfo(bag_index, slot_index)
-if is_locked then
+if is_locked and is_lootable then
 locked_item_id = ItemLinkToID(_G.GetContainerItemLink(bag_index, slot_index))
 break
 end
 end
 Debug("%s: No GUIDs found in loot. Blank loot window?", log_source)
 return false
 end
 local num_npcs = 0
 local num_objects = 0
+local num_itemcontainers = 0
 for source_guid, guid_data in pairs(extrapolated_guid_registry) do
 local unit_type = guid_data[1]
-local loot_label = (unit_type == private.UNIT_TYPES.OBJECT) and "opening" or (UnitTypeIsNPC(unit_type) and "drops" or nil)
+local loot_label = (unit_type == private.UNIT_TYPES.OBJECT) and "opening" or (UnitTypeIsNPC(unit_type) and "drops") or ((unit_type == private.UNIT_TYPES.PLAYER) and "contains")
 if loot_label then
 local unit_idnum = guid_data[2]
 if loot_guid_registry[loot_label] and loot_guid_registry[loot_label][source_guid] then
 elseif UnitTypeIsNPC(unit_type) then
 current_action.loot_label = loot_label
 current_action.target_type = AF.NPC
 current_action.identifier = unit_idnum
 num_npcs = num_npcs + 1
+-- Item container GUIDs are currently of the 'PLAYER' type; this may be unintended and could change in the future.
+elseif unit_type == private.UNIT_TYPES.PLAYER then
+current_action.loot_label = loot_label
+current_action.target_type = AF.ITEM
+-- current_action.identifier assigned during loot verification.
+num_itemcontainers = num_itemcontainers + 1
 end
 else
 -- Bail here; not only do we not know what this unit is, but we don't want to attribute loot to something that doesn't actually drop it.
 Debug("%s: Unit with GUID %s has unsupported type for looting.", log_source, source_guid)
 return false
 Debug("%s: Failure to obtain target_type.", log_source)
 return false
 end
 -- We can't figure out what dropped the loot. This shouldn't ever happen, but hey - Blizzard does some awesome stuff on occasion.
-if num_npcs ~= 0 and num_objects ~= 0 then
+if (num_npcs > 0 and num_objects + num_itemcontainers > 0) or (num_objects > 0 and num_npcs + num_itemcontainers > 0) or (num_itemcontainers > 0 and num_npcs + num_objects > 0) then
-Debug("%s: Mixed target types are not supported.", log_source)
+Debug("%s: Mixed target types are not supported. NPCs - %d, Objects - %d, Item Containers - %d.", log_source, num_npcs, num_objects, num_itemcontainers)
 return false
 end
 Debug("%s: Successfully extrapolated information for current_action.", log_source)
 return true
 Debug("%s: The current action's target type is unsupported or nil.", event_name)
 return
 end
 if _G.type(verify_func) == "function" and not verify_func() then
-Debug("%s: The current action type, %s, is supported but has failed loot verification.", event_name, current_action.target_type)
+Debug("%s: The current action type, %s, is supported but has failed loot verification.", event_name, private.ACTION_TYPE_NAMES[current_action.target_type])
 return
 end
 local guids_used = {}
 InitializeCurrentLoot()
 for loot_index = 1, #loot_info, 2 do
 local source_guid = loot_info[loot_index]
 if not loot_guid_registry[current_loot.label][source_guid] then
 local loot_quantity = loot_info[loot_index + 1]
-if #loot_info == 2 and slot_quantity > loot_quantity then
-loot_quantity = slot_quantity
+-- There is a new bug in 5.4.0 that causes GetLootSlotInfo() to (rarely) return nil values for slot_quantity.
-end
+if slot_quantity then
-local source_type, source_id = ParseGUID(source_guid)
+-- We need slot_quantity to account for an old bug where loot_quantity is sometimes '1' for stacks of items, such as cloth.
-local source_key = ("%s:%d"):format(private.UNIT_TYPE_NAMES[source_type + 1], source_id)
+if slot_quantity > loot_quantity then
+loot_quantity = slot_quantity
-if slot_type == _G.LOOT_SLOT_ITEM then
+end
-local item_id = ItemLinkToID(_G.GetLootSlotLink(loot_slot))
-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)
+local source_type, source_id = ParseGUID(source_guid)
-current_loot.sources[source_guid] = current_loot.sources[source_guid] or {}
+local source_key = ("%s:%d"):format(private.UNIT_TYPE_NAMES[source_type + 1], source_id)
-current_loot.sources[source_guid][item_id] = current_loot.sources[source_guid][item_id] or 0 + loot_quantity
-guids_used[source_guid] = true
+if slot_type == _G.LOOT_SLOT_ITEM then
-elseif slot_type == _G.LOOT_SLOT_MONEY then
+local item_id = ItemLinkToID(_G.GetLootSlotLink(loot_slot))
-Debug("GUID: %s - Type:ID: %s - Money - Amount: %d (%d)", loot_info[loot_index], source_key, loot_info[loot_index + 1], slot_quantity)
+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)
-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
+current_loot.sources[source_guid][item_id] = current_loot.sources[source_guid][item_id] or 0 + loot_quantity
 guids_used[source_guid] = true
+elseif slot_type == _G.LOOT_SLOT_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 == _G.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 icon_texture then
+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)
+if current_loot.target_type == AF.ZONE then
+table.insert(current_loot.list, ("currency:%d:%s"):format(loot_quantity, icon_texture:match("[^\\]+$"):lower()))
+else
+local currency_token = ("currency:%s"):format(icon_texture:match("[^\\]+$"):lower())
+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
+else
+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
 end
-elseif slot_type == _G.LOOT_SLOT_CURRENCY then
+else
-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)
+-- 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.
-if current_loot.target_type == AF.ZONE then
+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)
-table.insert(current_loot.list, ("currency:%d:%s"):format(loot_quantity, icon_texture:match("[^\\]+$"):lower()))
-else
-local currency_token = ("currency:%s"):format(icon_texture:match("[^\\]+$"):lower())
-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
 end
 end
 end
 end
 for item_index = 1, num_items do
 local _, _, copper_price, stack_size, num_available, _, extended_cost = _G.GetMerchantItemInfo(item_index)
 local item_id = ItemLinkToID(_G.GetMerchantItemLink(item_index))
+DatamineTT:ClearLines()
+DatamineTT:SetMerchantItem(item_index)
+if not item_id then
+local item_name, item_link = DatamineTT:GetItem()
+item_id = ItemLinkToID(item_link)
+Debug("%s: GetMerchantItemLink() still ocassionally fails, apparently. Failed item's ID - %s", event_name, item_id)
+end
 if item_id and item_id > 0 then
 local price_string = ActualCopperCost(copper_price, merchant_standing)
-DatamineTT:ClearLines()
-DatamineTT:SetMerchantItem(item_index)
 local num_lines = DatamineTT:NumLines()
 for line_index = 1, num_lines do
 local current_line = _G["WDPDatamineTTTextLeft" .. line_index]
 -- Keeping this around in case Blizzard makes the two points diverge at some point.
 --                    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
+-- 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 currency_identifier = item_link and ItemLinkToID(item_link) or nil
 if (not currency_identifier or currency_identifier < 1) and icon_texture then
 currency_identifier = icon_texture:match("[^\\]+$"):lower()
 table.wipe(current_action)
 end
 function WDP:PET_JOURNAL_LIST_UPDATE(event_name)
--- this function produces data currently unused by wowdb.com and it makes debugging errors in the .lua output nearly impossible due to the massive bloat
+-- This function produces data currently unused by wowdb.com and it makes debugging errors in the .lua output nearly impossible due to the massive bloat.
 if DEBUGGING then
 return
 end
 local num_pets = LPJ:NumPets()
 else
 Debug("%s: Spell ID %d is not a known raid or world boss 'Bonus' spell.", event_name, spell_id)
 return
 end
--- assign existing loot data to boss if it exists
+-- Assign existing loot data to boss if it exists
 if loot_toast_data then
 local npc_id = private.raid_finder_boss_id or private.world_boss_id
--- slightly messy hack to workaround duplicate world bosses
+-- Slightly messy hack to workaround duplicate world bosses
 local upper_limit = 0
 if DUPLICATE_WORLD_BOSS_IDS[npc_id] then
 upper_limit = #DUPLICATE_WORLD_BOSS_IDS[npc_id]
 end
 temp_npc_id = DUPLICATE_WORLD_BOSS_IDS[npc_id][i]
 end
 local npc = NPCEntry(temp_npc_id)
 if npc then
--- create needed npc fields if required
+-- Create needed npc fields if required
 local loot_label = "drops"
 local encounter_data = npc:EncounterData(InstanceDifficultyToken())
 encounter_data[loot_label] = encounter_data[loot_label] or {}
 encounter_data.loot_counts = encounter_data.loot_counts or {}
 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)
 Debug("%s: Assigned stored currency loot data - %s - currency:%d:%s", event_name, hyperlink, currency_texture, quantity)
--- workaround for Patch 5.4.0 bug with Flexible raid Siege of Orgrimmar bosses and Valor Points
+-- Workaround for Patch 5.4.0 bug with Flexible raid Siege of Orgrimmar bosses and Valor Points
 if quantity > 1000 and currency_texture == "pvecurrency-valor" then
 quantity = math.floor(quantity / 100)
 end
 table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
 end

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 324:9cc4ffab84d1 5.4.2-1