Advertisement
artfuleng

Grim Reaper 4.0.3 to 4.1.0 patch

May 3rd, 2011
349
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.70 KB | None | 0 0
  1. diff -Naur GrimReaper-4.0.3a/GrimReaper.lua GrimReaper-4.1.0/GrimReaper.lua
  2. --- GrimReaper-4.0.3a/GrimReaper.lua    2011-01-14 16:14:28.000000000 -0700
  3. +++ GrimReaper-4.1.0/GrimReaper.lua 2011-05-03 12:14:15.000000000 -0600
  4. @@ -548,7 +548,7 @@
  5.  local groupMask = 0x007            -- ditto    - 0x107
  6.  
  7.  -- COMBAT_LOG_EVENT_UNFILTERED
  8. -function module:COMBAT_LOG_EVENT_UNFILTERED(e, timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  9. +function module:COMBAT_LOG_EVENT_UNFILTERED(e, timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  10.     local ev = module.eventList[event]
  11.     if (ev ~= nil) then
  12.         if (UnitInRaid(dstName) or UnitInParty(dstName)) then   -- flags check fails if player's MC'd - band(dstFlags, groupMask) ~= 0) then
  13. @@ -563,10 +563,10 @@
  14.             end
  15.  
  16.             if (self.lastUnit and UnitGUID(self.lastUnit) == dstGUID) then
  17. -               if (self:OptionalFilters(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)) then
  18. +               if (self:OptionalFilters(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)) then
  19.                     if (self.offset == 0) then
  20.                         -- Only update if we're at the bottom
  21. -                       self:Tip(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  22. +                       self:Tip(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  23.                     end
  24.  
  25.                     --if (self.offset > 0 or (self.shownLines and self.shownLines < db.lines)) then
  26. @@ -574,7 +574,7 @@
  27.                     --  self:Tip()
  28.                     --end
  29.                      --
  30. -                   --self:Tip(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  31. +                   -- self:Tip(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  32.                 end
  33.             end
  34.         end
  35. @@ -624,7 +624,7 @@
  36.             n.healthmax = UnitHealthMax(unit)
  37.             n.realtime = time()
  38.             n.time = ts
  39. ---ChatFrame1:AddMessage("got health for "..date("%X", ts)..", health = "..format("%d%%", n.health / n.healthmax * 100))
  40. +           -- ChatFrame1:AddMessage("got health for "..date("%X", ts)..", health = "..format("%d%%", n.health / n.healthmax * 100))
  41.  
  42.             if (not o) then
  43.                 tinsert(list, n)
  44. @@ -1156,7 +1156,7 @@
  45.  -- MakeCombatLogLine
  46.  function module:MakeCombatLogLine(a, report)
  47.     --local msg = CombatLog_OnEvent(Blizzard_CombatLog_CurrentSettings, unpack(a)) unpack() stops at nils.. -.-
  48. -   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])
  49. +   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])
  50.     if (report) then
  51.         -- Remove colour codes
  52.         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", "")
  53. @@ -1776,7 +1776,7 @@
  54.  module.SPELL_AURA_STOLEN = module.SPELL_AURA_DISPELLED
  55.  module.SPELL_AURA_REMOVED = module.SPELL_AURA_APPLIED
  56.  
  57. -function module:AddLine(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  58. +function module:AddLine(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  59.     line = line + 1
  60.     local att = self.attachment
  61.     local frame = att.frames[line]
  62. @@ -1789,7 +1789,7 @@
  63.  
  64.     local ftext = frame.text
  65.     frame.a = del(frame.a)
  66. -   frame.a = new(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  67. +   frame.a = new(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  68.  
  69.     local f = self[event]
  70.     if (f) then
  71. @@ -2032,7 +2032,7 @@
  72.  end
  73.  
  74.  -- OptionalFilters
  75. -function module:OptionalFilters(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  76. +function module:OptionalFilters(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  77.     if (event == "SPELL_ENERGIZE") then
  78.         return false            -- Never want this
  79.     end
  80. @@ -2072,7 +2072,7 @@
  81.     local gotValid = 0
  82.     while (true) do
  83.         local color
  84. -       local timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags = CombatLogGetCurrentEntry()
  85. +       local timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags = CombatLogGetCurrentEntry()
  86.         if (dstName == unitName) then
  87.             if (self:OptionalFilters(CombatLogGetCurrentEntry())) then
  88.                 if (not self.firstTimeStamp) then
  89. @@ -2215,7 +2215,7 @@
  90.  
  91.  -- Tip
  92.  --function module:Tip(unit, tooltip)
  93. -function module:Tip(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  94. +function module:Tip(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  95.     local prevUnit = self.lastUnit
  96.     local unit, tooltip
  97.     if (type(timestamp) == "number") then
  98. @@ -2266,7 +2266,7 @@
  99.  
  100.     if (timestamp and self.offset == 0) then
  101.         local shown = self:ShuffleListUpward(timestamp)
  102. -       self:AddLine(timestamp, event, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  103. +       self:AddLine(timestamp, event, hideCaster, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  104.  
  105.         line = shown + 1
  106.         self:DoHealth()
  107. diff -Naur GrimReaper-4.0.3a/GrimReaper.toc GrimReaper-4.1.0/GrimReaper.toc
  108. --- GrimReaper-4.0.3a/GrimReaper.toc    2011-01-14 16:14:28.000000000 -0700
  109. +++ GrimReaper-4.1.0/GrimReaper.toc 2011-05-03 12:21:24.000000000 -0600
  110. @@ -1,4 +1,4 @@
  111. -## Interface: 40000
  112. +## Interface: 40100
  113.  ## Title: Grim Reaper by |cFFFF8080Zek|r
  114.  ## Notes: Review any raid or party members recent incoming combat along with health level.
  115.  ## Version: $Revision: 91 $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement