Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Naur GrimReaper-4.0.3a/GrimReaper.lua GrimReaper-4.1.0/GrimReaper.lua
- --- GrimReaper-4.0.3a/GrimReaper.lua 2011-01-14 16:14:28.000000000 -0700
- +++ GrimReaper-4.1.0/GrimReaper.lua 2011-05-03 12:14:15.000000000 -0600
- @@ -548,7 +548,7 @@
- local groupMask = 0x007 -- ditto - 0x107
- -- COMBAT_LOG_EVENT_UNFILTERED
- -function module:COMBAT_LOG_EVENT_UNFILTERED(e, timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- +function module:COMBAT_LOG_EVENT_UNFILTERED(e, timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- local ev = module.eventList[event]
- if (ev ~= nil) then
- if (UnitInRaid(dstName) or UnitInParty(dstName)) then -- flags check fails if player's MC'd - band(dstFlags, groupMask) ~= 0) then
- @@ -563,10 +563,10 @@
- end
- if (self.lastUnit and UnitGUID(self.lastUnit) == dstGUID) then
- - if (self:OptionalFilters(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)) then
- + if (self:OptionalFilters(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)) then
- if (self.offset == 0) then
- -- Only update if we're at the bottom
- - self:Tip(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- + self:Tip(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- end
- --if (self.offset > 0 or (self.shownLines and self.shownLines < db.lines)) then
- @@ -574,7 +574,7 @@
- -- self:Tip()
- --end
- --
- - --self:Tip(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- + -- self:Tip(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- end
- end
- end
- @@ -624,7 +624,7 @@
- n.healthmax = UnitHealthMax(unit)
- n.realtime = time()
- n.time = ts
- ---ChatFrame1:AddMessage("got health for "..date("%X", ts)..", health = "..format("%d%%", n.health / n.healthmax * 100))
- + -- ChatFrame1:AddMessage("got health for "..date("%X", ts)..", health = "..format("%d%%", n.health / n.healthmax * 100))
- if (not o) then
- tinsert(list, n)
- @@ -1156,7 +1156,7 @@
- -- MakeCombatLogLine
- function module:MakeCombatLogLine(a, report)
- --local msg = CombatLog_OnEvent(Blizzard_CombatLog_CurrentSettings, unpack(a)) unpack() stops at nils.. -.-
- - local msg = CombatLog_OnEvent(Blizzard_CombatLog_CurrentSettings, a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15], a[16], a[17], a[18], a[19], a[20])
- + local msg = CombatLog_OnEvent(Blizzard_CombatLog_CurrentSettings, a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15], a[16], a[17], a[18], a[19], a[20], a[21])
- if (report) then
- -- Remove colour codes
- msg = msg:gsub("|c[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]", ""):gsub("|r", "")
- @@ -1776,7 +1776,7 @@
- module.SPELL_AURA_STOLEN = module.SPELL_AURA_DISPELLED
- module.SPELL_AURA_REMOVED = module.SPELL_AURA_APPLIED
- -function module:AddLine(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- +function module:AddLine(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- line = line + 1
- local att = self.attachment
- local frame = att.frames[line]
- @@ -1789,7 +1789,7 @@
- local ftext = frame.text
- frame.a = del(frame.a)
- - frame.a = new(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- + frame.a = new(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- local f = self[event]
- if (f) then
- @@ -2032,7 +2032,7 @@
- end
- -- OptionalFilters
- -function module:OptionalFilters(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- +function module:OptionalFilters(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- if (event == "SPELL_ENERGIZE") then
- return false -- Never want this
- end
- @@ -2072,7 +2072,7 @@
- local gotValid = 0
- while (true) do
- local color
- - local timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags = CombatLogGetCurrentEntry()
- + local timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags = CombatLogGetCurrentEntry()
- if (dstName == unitName) then
- if (self:OptionalFilters(CombatLogGetCurrentEntry())) then
- if (not self.firstTimeStamp) then
- @@ -2215,7 +2215,7 @@
- -- Tip
- --function module:Tip(unit, tooltip)
- -function module:Tip(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- +function module:Tip(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- local prevUnit = self.lastUnit
- local unit, tooltip
- if (type(timestamp) == "number") then
- @@ -2266,7 +2266,7 @@
- if (timestamp and self.offset == 0) then
- local shown = self:ShuffleListUpward(timestamp)
- - self:AddLine(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- + self:AddLine(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
- line = shown + 1
- self:DoHealth()
- diff -Naur GrimReaper-4.0.3a/GrimReaper.toc GrimReaper-4.1.0/GrimReaper.toc
- --- GrimReaper-4.0.3a/GrimReaper.toc 2011-01-14 16:14:28.000000000 -0700
- +++ GrimReaper-4.1.0/GrimReaper.toc 2011-05-03 12:21:24.000000000 -0600
- @@ -1,4 +1,4 @@
- -## Interface: 40000
- +## Interface: 40100
- ## Title: Grim Reaper by |cFFFF8080Zek|r
- ## Notes: Review any raid or party members recent incoming combat along with health level.
- ## Version: $Revision: 91 $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement