wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 299:0946f1091810

Tighten up group detection, and disregard the check when in an instance.

author	James D. Callahan III <jcallahan@curse.com>
date	Mon, 01 Jul 2013 13:04:27 -0500
parents	841eeb16dcf7
children	e5c2dc3c7f6f

comparison

equal deleted inserted replaced

-:841eeb16dcf7
+:0946f1091810
 UNIT_SPELLCAST_FAILED_QUIET = "HandleSpellFailure",
 UNIT_SPELLCAST_INTERRUPTED = "HandleSpellFailure",
 UNIT_SPELLCAST_SENT = true,
 UNIT_SPELLCAST_SUCCEEDED = true,
 VOID_STORAGE_OPEN = true,
-ZONE_CHANGED = "SetCurrentAreaID",
+ZONE_CHANGED = "HandleZoneChange",
-ZONE_CHANGED_INDOORS = "SetCurrentAreaID",
+ZONE_CHANGED_INDOORS = "HandleZoneChange",
-ZONE_CHANGED_NEW_AREA = "SetCurrentAreaID",
+ZONE_CHANGED_NEW_AREA = "HandleZoneChange",
 }
 -- VARIABLES ----------------------------------------------------------
 local anvil_spell_ids = {}
 local currently_drunk
 local char_db
 local global_db
-local group_member_uids = {}
+local group_member_guids = {}
 local group_owner_guids_to_pet_guids = {}
 local group_pet_guids = {}
+local in_instance
 local item_process_timer_handle
 local faction_standings = {}
 local forge_spell_ids = {}
 local languages_known = {}
 local name_to_id_map = {}
 local MICRO_DUNGEON_IDS = {
 ShrineofTwoMoons = 903,
 ShrineofSevenStars = 905,
 }
-function WDP:SetCurrentAreaID(event_name)
+local function SetCurrentAreaID()
 if private.in_combat then
 private.set_area_id = true
 return
 end
 local map_area_id = _G.GetCurrentMapAreaID()
 _G.SetMapByID(map_area_id)
 else
 world_map:Hide()
 _G.SetCVar("Sound_EnableSFX", sfx_value)
 end
+end
+function WDP:HandleZoneChange(event_name)
+in_instance = _G.IsInInstance()
+SetCurrentAreaID()
 end
 end
 -- METHODS ------------------------------------------------------------
 end
 local _, item_link = _G.GetItemInfo(identifier)
 HandleItemUse(item_link)
 end)
-self:SetCurrentAreaID("OnEnable")
+self:HandleZoneChange("OnEnable")
 self:GROUP_ROSTER_UPDATE()
 end
 local ScrapeItemUpgradeStats
 function WDP:GROUP_ROSTER_UPDATE(event_name)
 local is_raid = _G.IsInRaid()
 local unit_type = is_raid and "raid" or "party"
 local group_size = is_raid and _G.GetNumGroupMembers() or _G.GetNumSubgroupMembers()
-table.wipe(group_member_uids)
+table.wipe(group_member_guids)
 Debug("GROUP_ROSTER_UPDATE: %s group - %d members.", unit_type, group_size)
 for index = 1, group_size do
 local unit_id = unit_type .. index
 local unit_guid = _G.UnitGUID(unit_id)
-group_member_uids[unit_guid] = true
+group_member_guids[unit_guid] = true
 Debug("%s (%s) added as GUID %s", unit_id, _G.UnitName(unit_id), unit_guid)
 UpdateUnitPet(unit_guid, unit_id)
 end
-group_member_uids[_G.UnitGUID("player")] = true
+group_member_guids[PLAYER_GUID] = true
 end
 function WDP:UNIT_PET(event_name, unit_id)
 UpdateUnitPet(_G.UnitGUID(unit_id), unit_id)
 source_guid = nil
 end
 local killer_guid = source_guid or previous_combat_event.source_guid
 local killer_name = source_name or previous_combat_event.source_name
-table.wipe(previous_combat_event)
+if not previous_combat_event.party_damage then
-if not group_member_uids[killer_guid] and not group_pet_guids[killer_guid] 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()
 return
 end
 Debug("%s: %s was killed by %s.", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN)
 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
-else
+end
-Debug("%s: Killed NPC %s (ID: %d) is not in LFG or World boss list.", sub_event, dest_name, unit_idnum)
-end
 killed_npc_id = unit_idnum
 WDP:ScheduleTimer(ClearKilledNPC, 0.1)
 WDP:ScheduleTimer(ClearKilledBossID, 1)
 end,
 }
 SPELL_AURA_REMOVED_DOSE = true,
 SPELL_CAST_FAILED = true,
 SWING_MISSED = true,
 }
+local DAMAGE_EVENTS = {
+RANGE_DAMAGE = true,
+SPELL_BUILDING_DAMAGE = true,
+SPELL_DAMAGE = true,
+SPELL_PERIODIC_DAMAGE = true,
+SWING_DAMAGE = true,
+}
 function WDP:COMBAT_LOG_EVENT_UNFILTERED(event_name, 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]
 if not combat_log_func then
-if not NON_DAMAGE_EVENTS[sub_event] then
+if DAMAGE_EVENTS[sub_event] then
--- Uncomment to look for other sub-events to blacklist.
+table.wipe(previous_combat_event)
---                Debug("Recording for %s", sub_event)
-previous_combat_event.source_guid = source_guid
 previous_combat_event.source_name = source_name
+if source_guid ~= dest_guid and (in_instance or group_member_guids[source_guid] or group_pet_guids[source_guid]) then
+previous_combat_event.party_damage = true
+end
 end
 return
 end
 combat_log_func(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, ...)
 function WDP:PLAYER_REGEN_ENABLED(event_name)
 private.in_combat = nil
 if private.set_area_id then
-self:SetCurrentAreaID(event_name)
+self:HandleZoneChange(event_name)
 private.set_area_id = nil
 end
 end

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 299:0946f1091810