wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 306:7feb687b1b22

Fixes

author	James D. Callahan III <jcallahan@curse.com>
date	Tue, 23 Jul 2013 18:07:07 -0500
parents	4986ef8a338a
children	c33ab3413737

comparison

equal deleted inserted replaced

-:4986ef8a338a
+:7feb687b1b22
 local bit = _G.bit
 local math = _G.math
 local table = _G.table
 local select = _G.select
+local unpack = _G.unpack
 -- ADDON NAMESPACE ----------------------------------------------------
 local ADDON_NAME, private = ...
 QUEST_COMPLETE = true,
 QUEST_DETAIL = true,
 QUEST_LOG_UPDATE = true,
 QUEST_PROGRESS = true,
 SHOW_LOOT_TOAST = true,
+SPELL_CONFIRMATION_PROMPT = true,
 TAXIMAP_OPENED = true,
 TRADE_SKILL_SHOW = true,
 TRAINER_CLOSED = true,
 TRAINER_SHOW = true,
 TRANSMOGRIFY_OPEN = true,
 local in_instance
 local item_process_timer_handle
 local faction_standings = {}
 local forge_spell_ids = {}
 local languages_known = {}
+local loot_toast_container_timer_handle
 local name_to_id_map = {}
+local killed_boss_id_timer_handle
 local killed_npc_id
 local target_location_timer_handle
 local current_target_id
 local current_area_id
 local current_loot
 -- HELPERS ------------------------------------------------------------
 local function Debug(message, ...)
-if not DEBUGGING then
+if not DEBUGGING or not message or not ... then
 return
 end
-_G.print(message:format(...))
+local args = { ... }
+for index = 1, #args do
+if args[index] == nil then
+args[index] = "nil"
+end
+end
+_G.print(message:format(unpack(args)))
 end
 local TradeSkillExecutePer
 do
 local header_list = {}
--- iter_func returns true to indicate that the loop should be broken
 function TradeSkillExecutePer(iter_func)
 if not _G.TradeSkillFrame or not _G.TradeSkillFrame:IsVisible() then
 return
 end
 -- Clear the search box focus so the scan will have correct results.
 killed_npc_id = nil
 end
 local function ClearKilledBossID()
+if killed_boss_id_timer_handle then
+WDP:CancelTimer(killed_boss_id_timer_handle)
+end
+private.boss_loot_toasting = false
 private.raid_finder_boss_id = nil
 private.world_boss_id = nil
+killed_boss_id_timer_handle = nil
+end
+local function ClearLootToastContainerID()
+if loot_toast_container_timer_handle then
+WDP:CancelTimer(loot_toast_container_timer_handle)
+end
+private.container_loot_toasting = false
+private.loot_toast_container_id = nil
+loot_toast_container_timer_handle = nil
 end
 local function InstanceDifficultyToken()
 local _, instance_type, instance_difficulty, _, _, _, is_dynamic = _G.GetInstanceInfo()
 local current_line = _G["WDPDatamineTTTextLeft" .. line_index]
 if not current_line then
 break
 end
-local is_ptr = select(4, _G.GetBuildInfo()) ~= 50100
+if current_line:GetText() == _G.ITEM_OPENABLE then
-if is_ptr or current_line:GetText() == _G.ITEM_OPENABLE then
 table.wipe(current_action)
 current_action.target_type = AF.ITEM
 current_action.identifier = item_id
 current_action.loot_label = "contains"
 break
 local loot_table = LootTable(entry, loot_type, top_field)
 if not source_list[source_id] then
 if top_field then
 entry[top_field][loot_count] = (entry[top_field][loot_count] or 0) + 1
-else
+elseif not private.container_loot_toasting then
 entry[loot_count] = (entry[loot_count] or 0) + 1
 end
 source_list[source_id] = true
 end
 UpdateDBEntryLocation(data_type, source_id)
 UpdateUnitPet(_G.UnitGUID(unit_id), unit_id)
 end
 function WDP:SHOW_LOOT_TOAST(event_name, loot_type, item_link, quantity)
+if not loot_type or (loot_type ~= "item" and loot_type ~= "money") then
+Debug("%s: loot_type is %s. Item link is %s, and quantity is %d.", event_name, loot_type, item_link, quantity)
+return
+end
 local container_id = private.loot_toast_container_id
 local item_id = ItemLinkToID(item_link)
 local npc = NPCEntry(private.raid_finder_boss_id or private.world_boss_id)
-ClearKilledBossID()
 if npc then
 if not item_id then
 Debug("%s: ItemID is nil, from item link %s", event_name, item_link)
 return
 end
-local loot_type = "drops"
+local loot_label = "drops"
 local encounter_data = npc:EncounterData(InstanceDifficultyToken())
-encounter_data[loot_type] = encounter_data[loot_type] or {}
+encounter_data[loot_label] = encounter_data[loot_label] or {}
 encounter_data.loot_counts = encounter_data.loot_counts or {}
-encounter_data.loot_counts[loot_type] = (encounter_data.loot_counts[loot_type] or 0) + 1
+if not private.boss_loot_toasting then
-table.insert(encounter_data[loot_type], ("%d:%d"):format(item_id, quantity))
+encounter_data.loot_counts[loot_label] = (encounter_data.loot_counts[loot_label] or 0) + 1
-Debug("%s: %sX%d (%d)", event_name, item_link, quantity, item_id)
+end
+if loot_type == "item" then
+Debug("%s: %sX%d (%d)", event_name, item_link, quantity, item_id)
+table.insert(encounter_data[loot_label], ("%d:%d"):format(item_id, quantity))
+elseif loot_type == "money" then
+Debug("%s: money - %d", event_name, quantity)
+table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
+end
+private.boss_loot_toasting = true -- Do not count further loots until timer expires or another boss is killed
 elseif container_id then
-private.loot_toast_container_id = nil
 InitializeCurrentLoot()
+-- Fake the loot characteristics to match that of an actual container item
+current_loot.identifier = container_id
+current_loot.label = "contains"
+current_loot.target_type = AF.ITEM
 if loot_type == "item" then
 if not item_id then
 Debug("%s: ItemID is nil, from item link %s", event_name, item_link)
 return
 elseif loot_type == "money" then
 table.insert(current_loot.list, ("money:%d"):format(quantity))
 end
 GenericLootUpdate("items")
 current_loot = nil
+private.container_loot_toasting = true -- do not count further loots until timer expires or another container is opened
 else
 Debug("%s: NPC and Container are nil.", event_name)
 end
 end
 if not previous_combat_event.party_damage then
 Debug("%s: %s was killed by %s (not group member or pet).", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN)
 table.wipe(previous_combat_event)
 ClearKilledNPC()
-ClearKilledBossID()
+else
-return
+Debug("%s: %s was killed by %s.", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN)
-end
-Debug("%s: %s was killed by %s.", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN)
-if private.RAID_FINDER_BOSS_IDS[unit_idnum] then
-Debug("%s: Matching boss %s.", sub_event, dest_name)
-ClearKilledBossID()
-private.raid_finder_boss_id = unit_idnum
-elseif private.WORLD_BOSS_IDS[unit_idnum] then
-Debug("%s: Matching world boss %s.", sub_event, dest_name)
-ClearKilledBossID()
-private.world_boss_id = unit_idnum
 end
 killed_npc_id = unit_idnum
 WDP:ScheduleTimer(ClearKilledNPC, 0.1)
-WDP:ScheduleTimer(ClearKilledBossID, 1)
 end,
 }
 local NON_DAMAGE_EVENTS = {
 local spell_label = private.SPELL_LABELS_BY_NAME[spell_name]
 if not spell_label then
 return
 end
 local item_name, item_link = _G.GameTooltip:GetItem()
 local unit_name, unit_id = _G.GameTooltip:GetUnit()
 if not unit_name and _G.UnitName("target") == target_name then
 unit_name = target_name
 end
 private.tracked_line = spell_line
 end
-do
+function WDP:SPELL_CONFIRMATION_PROMPT(event_name, spell_id, confirm_type, text, duration, currency_id)
-local LOOT_SPELL_ID_TO_ITEM_ID_MAP = {
+if private.RAID_BOSS_BONUS_SPELL_ID_TO_NPC_ID_MAP[spell_id] then
-[142397] = 98134, -- Heroic Cache of Treasures
+ClearKilledBossID()
-[143506] = 98095, -- Brawler's Pet Supplies
+ClearLootToastContainerID()
-[143507] = 94207, -- Fabled Pandaren Pet Supplies
+private.raid_finder_boss_id = private.RAID_BOSS_BONUS_SPELL_ID_TO_NPC_ID_MAP[spell_id]
-[143512] = 93148, -- Pandaren Spirit Pet Supplies
+elseif private.WORLD_BOSS_BONUS_SPELL_ID_TO_NPC_ID_MAP[spell_id] then
-[143511] = 93149, -- Pandaren Spirit Pet Supplies
+ClearKilledBossID()
-[143510] = 93147, -- Pandaren Spirit Pet Supplies
+ClearLootToastContainerID()
-[143509] = 93146, -- Pandaren Spirit Pet Supplies
+private.world_boss_id = private.WORLD_BOSS_BONUS_SPELL_ID_TO_NPC_ID_MAP[spell_id]
-[143508] = 89125, -- Sack of Pet Supplies
+else
-}
+Debug("%s: Spell ID %d is not a known raid or world boss 'Bonus' spell.", event_name, spell_id)
+return
-function WDP:UNIT_SPELLCAST_SUCCEEDED(event_name, unit_id, spell_name, spell_rank, spell_line, spell_id)
+end
-if unit_id ~= "player" then
-return
+killed_boss_id_timer_handle = WDP:ScheduleTimer(ClearKilledBossID, 1) -- we need to assign a handle here to cancel it later
 end
-private.tracked_line = nil
-private.previous_spell_id = spell_id
-private.loot_toast_container_id = LOOT_SPELL_ID_TO_ITEM_ID_MAP[spell_id]
+function WDP:UNIT_SPELLCAST_SUCCEEDED(event_name, unit_id, spell_name, spell_rank, spell_line, spell_id)
+if unit_id ~= "player" then
-if anvil_spell_ids[spell_id] then
+return
-UpdateDBEntryLocation("objects", OBJECT_ID_ANVIL)
+end
-elseif forge_spell_ids[spell_id] then
+private.tracked_line = nil
-UpdateDBEntryLocation("objects", OBJECT_ID_FORGE)
+private.previous_spell_id = spell_id
-elseif spell_name:match("^Harvest.+") then
-killed_npc_id = current_target_id
+if private.LOOT_SPELL_ID_TO_ITEM_ID_MAP[spell_id] then
-private.harvesting = true
+ClearKilledBossID()
-end
+ClearLootToastContainerID()
-end
-end -- do-block
+private.loot_toast_container_id = private.LOOT_SPELL_ID_TO_ITEM_ID_MAP[spell_id]
+loot_toast_container_timer_handle = WDP:ScheduleTimer(ClearLootToastContainerID, 1) -- we need to assign a handle here to cancel it later
+end
+if anvil_spell_ids[spell_id] then
+UpdateDBEntryLocation("objects", OBJECT_ID_ANVIL)
+elseif forge_spell_ids[spell_id] then
+UpdateDBEntryLocation("objects", OBJECT_ID_FORGE)
+elseif spell_name:match("^Harvest.+") then
+killed_npc_id = current_target_id
+private.harvesting = true
+end
+end
 function WDP:HandleSpellFailure(event_name, unit_id, spell_name, spell_rank, spell_line, spell_id)
 if unit_id ~= "player" then
 return

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 306:7feb687b1b22