wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 48:4668938a63e5

Fixed gas extraction support using Black Magic Voodoo, since the UNIT_DISSIPATES sub-event no longer fires from COMBAT_LOG_EVENT_UNFILTERED.

author	James D. Callahan III <jcallahan@curse.com>
date	Wed, 27 Jun 2012 17:34:10 -0500
parents	768c5f3587c2
children	66034def453b

comparison

equal deleted inserted replaced

-:768c5f3587c2
+:4668938a63e5
 -----------------------------------------------------------------------
 local ADDON_NAME, private = ...
 local LibStub = _G.LibStub
 local WDP = LibStub("AceAddon-3.0"):NewAddon(ADDON_NAME, "AceEvent-3.0", "AceTimer-3.0")
+local deformat = LibStub("LibDeformat-3.0")
 local DatamineTT = _G.CreateFrame("GameTooltip", "WDPDatamineTT", _G.UIParent, "GameTooltipTemplate")
 DatamineTT:SetOwner(_G.WorldFrame, "ANCHOR_NONE")
 }
 }
 local EVENT_MAPPING = {
+CHAT_MSG_LOOT = true,
 CHAT_MSG_SYSTEM = true,
 COMBAT_LOG_EVENT_UNFILTERED = true,
 COMBAT_TEXT_UPDATE = true,
 ITEM_TEXT_BEGIN = true,
 LOOT_OPENED = true,
 end
 end
 end
 end -- do-block
+local function GenericLootUpdate(data_type, top_field, inline_drops)
+local entry = DBEntry(data_type, action_data.identifier)
+if not entry then
+return
+end
+local loot_type = action_data.label or "drops"
+local loot_count = ("%s_count"):format(loot_type)
+local loot_data
+if top_field then
+entry[top_field] = entry[top_field] or {}
+entry[top_field][loot_count] = (entry[top_field][loot_count] or 0) + 1
+entry[top_field][loot_type] = entry[top_field][loot_type] or {}
+loot_data = entry[top_field][loot_type]
+else
+entry[loot_count] = (entry[loot_count] or 0) + 1
+entry[loot_type] = entry[loot_type] or {}
+loot_data = entry[loot_type]
+end
+for index = 1, #action_data.loot_list do
+table.insert(loot_data, action_data.loot_list[index])
+end
+end
 -----------------------------------------------------------------------
 -- Methods.
 -----------------------------------------------------------------------
 function WDP:OnInitialize()
 db = LibStub("AceDB-3.0"):New("WoWDBProfilerData", DATABASE_DEFAULTS, "Default").global
 -----------------------------------------------------------------------
 -- Event handlers.
 -----------------------------------------------------------------------
+function WDP:CHAT_MSG_LOOT(event, message)
+if action_data.spell_label ~= "EXTRACT_GAS" then
+return
+end
+local item_link, quantity = deformat(message, _G.LOOT_ITEM_PUSHED_SELF_MULTIPLE)
+if not item_link then
+quantity, item_link = 1, deformat(message, _G.LOOT_ITEM_PUSHED_SELF)
+end
+if not item_link then
+return
+end
+local item_id = ItemLinkToID(item_link)
+if not item_id then
+return
+end
+action_data.loot_list = {
+("%d:%d"):format(item_id, quantity)
+}
+GenericLootUpdate("zones")
+table.wipe(action_data)
+end
 do
 local SOBER_MATCH = _G.DRUNK_MESSAGE_ITEM_SELF1:gsub("%%s", ".+")
 local DRUNK_COMPARES = {
 _G.DRUNK_MESSAGE_SELF2,
 end
 -- do-block
 do
-local EXTRACT_GAS_SPELL_ID = 30427
 local FLAGS_NPC = bit.bor(_G.COMBATLOG_OBJECT_TYPE_GUARDIAN, _G.COMBATLOG_OBJECT_CONTROL_NPC)
 local FLAGS_NPC_CONTROL = bit.bor(_G.COMBATLOG_OBJECT_AFFILIATION_OUTSIDER, _G.COMBATLOG_OBJECT_CONTROL_NPC)
 local function RecordNPCSpell(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, spell_id, spell_name)
 end
 local COMBAT_LOG_FUNCS = {
 SPELL_AURA_APPLIED = RecordNPCSpell,
 SPELL_CAST_START = RecordNPCSpell,
-SPELL_CAST_SUCCESS = function(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, spell_id, ...)
+SPELL_CAST_SUCCESS = RecordNPCSpell,
-if spell_id == EXTRACT_GAS_SPELL_ID and source_guid == PLAYER_GUID then
-table.wipe(action_data)
-action_data.extracting_gas = true
-action_data.timestamp = _G.GetTime()
-else
-RecordNPCSpell(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, spell_id, ...)
-end
-end,
-UNIT_DISSIPATES = function(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags)
-if action_data.extracting_gas and _G.GetTime() - action_data.timestamp <= 3 then
-local unit_type, unit_idnum = ParseGUID(dest_guid)
-UpdateNPCLocation(unit_idnum)
-end
-end,
 }
 function WDP:COMBAT_LOG_EVENT_UNFILTERED(event, time_stamp, sub_event, hide_caster, source_guid, source_name, source_flags, source_raid_flags, dest_guid, dest_name, dest_flags, dest_raid_flags, ...)
 local combat_log_func = COMBAT_LOG_FUNCS[sub_event]
 return _G.IsFishingLoot()
 end,
 }
-local function GenericLootUpdate(data_type, top_field, inline_drops)
-local entry = DBEntry(data_type, action_data.identifier)
-if not entry then
-return
-end
-local loot_type = action_data.label or "drops"
-local loot_count = ("%s_count"):format(loot_type)
-local loot_data
-if top_field then
-entry[top_field][loot_count] = (entry[top_field][loot_count] or 0) + 1
-entry[top_field] = entry[top_field] or {}
-entry[top_field][loot_type] = entry[top_field][loot_type] or {}
-loot_data = entry[top_field][loot_type]
-else
-entry[loot_count] = (entry[loot_count] or 0) + 1
-entry[loot_type] = entry[loot_type] or {}
-loot_data = entry[loot_type]
-end
-for index = 1, #action_data.loot_list do
-table.insert(loot_data, action_data.loot_list[index])
-end
-end
 local LOOT_UPDATE_FUNCS = {
 [AF.ITEM] = function()
 GenericLootUpdate("items")
 end,
 [AF.NPC] = function()
 action_data.type = AF.OBJECT
 action_data.identifier = identifier
 elseif bit.band(spell_flags, AF.ZONE) == AF.ZONE then
 local identifier = ("%s:%s"):format(spell_label, _G["GameTooltipTextLeft1"]:GetText() or "NONE") -- Possible fishing pool name.
-action_data.zone_data = UpdateDBEntryLocation("zones", identifier, "fishing_locations")
+action_data.zone_data = UpdateDBEntryLocation("zones", identifier, (spell_label == "FISHING") and "fishing_locations" or nil)
 action_data.type = AF.ZONE
 action_data.identifier = identifier
+action_data.spell_label = spell_label
 end
 end
 private.tracked_line = spell_line
 end

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 48:4668938a63e5