API tools faq
paste
Advertisement
Guest User

GrimReaper 4.2

a guest
Jul 3rd, 2011
515
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 9.02 KB | None | 0 0
raw download clone embed print report
  1. --- GrimReaper.lua  2011-05-10 22:56:02.000000000 +0200
  2. +++ GrimReaper.lua  2011-07-03 12:28:19.586645222 +0200
  3. @@ -548,7 +548,7 @@
  4.  local groupMask = 0x007            -- ditto    - 0x107
  5.  
  6.  
  7.  
  8.  -- COMBAT_LOG_EVENT_UNFILTERED
  9.  
  10. -function module:COMBAT_LOG_EVENT_UNFILTERED(e, timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  11.  
  12. +function module:COMBAT_LOG_EVENT_UNFILTERED(e, timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)
  13.  
  14.     local ev = module.eventList[event]
  15.  
  16.     if (ev ~= nil) then
  17.  
  18.         if (UnitInRaid(dstName) or UnitInParty(dstName)) then   -- flags check fails if player's MC'd - band(dstFlags, groupMask) ~= 0) then
  19.  
  20. @@ -563,10 +563,10 @@
  21.             end
  22.  
  23.  
  24.  
  25.             if (self.lastUnit and UnitGUID(self.lastUnit) == dstGUID) then
  26.  
  27. -               if (self:OptionalFilters(timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)) then
  28.  
  29. +               if (self:OptionalFilters(timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)) then
  30.  
  31.                     if (self.offset == 0) then
  32.  
  33.                         -- Only update if we're at the bottom
  34.  
  35. -                       self:Tip(timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  36.  
  37. +                       self:Tip(timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)
  38.  
  39.                     end
  40.  
  41.  
  42.  
  43.                     --if (self.offset > 0 or (self.shownLines and self.shownLines < db.lines)) then
  44.  
  45. @@ -1157,7 +1157,7 @@
  46.  -- MakeCombatLogLine
  47.  
  48.  function module:MakeCombatLogLine(a, report)
  49.  
  50.     --local msg = CombatLog_OnEvent(Blizzard_CombatLog_CurrentSettings, unpack(a)) unpack() stops at nils.. -.-
  51.  
  52. -   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])
  53.  
  54. +   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], a[22], a[23])
  55.  
  56.     if (report) then
  57.  
  58.         -- Remove colour codes
  59.  
  60.         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", "")
  61.  
  62. @@ -1649,7 +1649,7 @@
  63.  end
  64.  
  65.  
  66.  
  67.  -- SWING_DAMAGE
  68.  
  69. -function module:SWING_DAMAGE(frame, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  70.  
  71. +function module:SWING_DAMAGE(frame, mistery, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  72.  
  73.     frame.a.amount = amount - overkill
  74.  
  75.     AddAmount(frame.text, amount, resisted, blocked, absorbed, crushing, school)
  76.  
  77.     GetModifier(frame, critical, glancing, crushing)
  78.  
  79. @@ -1660,7 +1660,7 @@
  80.     frame.text:SetTextColor(unpack(specialColour))
  81.  
  82.  end
  83.  
  84.  
  85.  
  86. -function module:SPELL_DAMAGE(frame, spellId, spellName, spellSchool, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  87.  
  88. +function module:SPELL_DAMAGE(frame, spellId, spellName, spellSchool, mistery, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  89.  
  90.     frame.a.amount = amount - overkill
  91.  
  92.     AddAmount(frame.text, amount, resisted, blocked, absorbed, crushing, school, spellSchool)
  93.  
  94.     GetModifier(frame, critical, glancing, crushing)
  95.  
  96. @@ -1669,7 +1669,7 @@
  97.     frame.a.harmSchool = spellSchool
  98.  
  99.  end
  100.  
  101.  
  102.  
  103. -function module:SPELL_MISSED(frame, spellId, spellName, spellSchool, missType, amountMissed, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  104.  
  105. +function module:SPELL_MISSED(frame, spellId, spellName, spellSchool, mistery, missType, amountMissed, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  106.  
  107.     local miss = _G["ACTION_SPELL_MISSED_"..missType]
  108.  
  109.     if (not miss) then
  110.  
  111.         if (absorbed) then
  112.  
  113. @@ -1690,7 +1690,7 @@
  114.     frame.a.harmSchool = spellSchool
  115.  
  116.  end
  117.  
  118.  
  119.  
  120. -function module:SPELL_HEAL(frame, spellId, spellName, spellSchool, amount, overhealing, absorbed, critical)
  121.  
  122. +function module:SPELL_HEAL(frame, spellId, spellName, spellSchool, mistery, amount, overhealing, absorbed, critical)
  123.  
  124.     frame.a.amount = amount - overhealing
  125.  
  126.     frame.text:SetFormattedText("+%d", amount)
  127.  
  128.     frame.text:SetTextColor(unpack(healColour))
  129.  
  130. @@ -1700,7 +1700,7 @@
  131.     frame.a.helpSchool = spellSchool
  132.  
  133.  end
  134.  
  135.  
  136.  
  137. -function module:SPELL_AURA_DISPELLED(frame, spellId, spellName, spellSchool, extraSpellId, extraSpellName, extraSpellSchool, auraType)
  138.  
  139. +function module:SPELL_AURA_DISPELLED(frame, spellId, spellName, spellSchool, mistery, extraSpellId, extraSpellName, extraSpellSchool, auraType)
  140.  
  141.     local srcFlags = frame.a[6]
  142.  
  143.     local srcName = frame.a[5]
  144.  
  145.     local srcGUID = frame.a[4]
  146.  
  147. @@ -1720,7 +1720,7 @@
  148.     frame.a.harmSchool = extraSpellSchool
  149.  
  150.  end
  151.  
  152.  
  153.  
  154. -function module:SPELL_AURA_APPLIED(frame, spellId, spellName, spellSchool, auraType)
  155.  
  156. +function module:SPELL_AURA_APPLIED(frame, mistery, spellId, spellName, spellSchool, auraType)
  157.  
  158.     local event = frame.a[2]
  159.  
  160.     frame.text:SetFormattedText("%s%s", event == "SPELL_AURA_APPLIED" and "++" or "--", spellName)
  161.  
  162.     local colour
  163.  
  164. @@ -1748,7 +1748,7 @@
  165.     frame.a.spellName = spellName
  166.  
  167.  end
  168.  
  169.  
  170.  
  171. -function module:DAMAGE_SHIELD(frame, spellId, spellName, spellSchool, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  172.  
  173. +function module:DAMAGE_SHIELD(frame, spellId, spellName, spellSchool, mistery, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  174.  
  175.     frame.a.amount = amount - overkill
  176.  
  177.     frame.text:SetFormattedText("DS -%d", amount)
  178.  
  179.     GetModifier(frame, critical, glancing, crushing)
  180.  
  181. @@ -1756,7 +1756,7 @@
  182.     frame.a.harmSchool = spellSchool
  183.  
  184.  end
  185.  
  186.  
  187.  
  188. -function module:ENVIRONMENTAL_DAMAGE(frame, environmentalType, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  189.  
  190. +function module:ENVIRONMENTAL_DAMAGE(frame, environmentalType, mistery, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing)
  191.  
  192.     local spellName = _G["ACTION_ENVIRONMENTAL_DAMAGE_"..environmentalType]
  193.  
  194.     if (resisted or blocked or absorbed) then
  195.  
  196.         local prefix = format("%s%s%s", resisted and "r" or "", blocked and "b" or "", absorbed and "a" or "")
  197.  
  198. @@ -1777,7 +1777,7 @@
  199.  module.SPELL_AURA_STOLEN = module.SPELL_AURA_DISPELLED
  200.  
  201.  module.SPELL_AURA_REMOVED = module.SPELL_AURA_APPLIED
  202.  
  203.  
  204.  
  205. -function module:AddLine(timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  206.  
  207. +function module:AddLine(timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)
  208.  
  209.     line = line + 1
  210.  
  211.     local att = self.attachment
  212.  
  213.     local frame = att.frames[line]
  214.  
  215. @@ -1786,11 +1786,11 @@
  216.     end
  217.  
  218.  
  219.  
  220.     --local color, missType
  221.  
  222. -   --local spellId, spellName, spellSchool, amount, school, resisted, blocked, absorbed, critical, glancing, crushing, overkill, overhealing
  223.  
  224. +   --local spellId, spellName, spellSchool, mistery, amount, school, resisted, blocked, absorbed, critical, glancing, crushing, overkill, overhealing
  225.  
  226.  
  227.  
  228.     local ftext = frame.text
  229.  
  230.     frame.a = del(frame.a)
  231.  
  232. -   frame.a = new(timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  233.  
  234. +   frame.a = new(timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)
  235.  
  236.  
  237.  
  238.     local f = self[event]
  239.  
  240.     if (f) then
  241.  
  242. @@ -2033,7 +2033,7 @@
  243.  end
  244.  
  245.  
  246.  
  247.  -- OptionalFilters
  248.  
  249. -function module:OptionalFilters(timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  250.  
  251. +function module:OptionalFilters(timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)
  252.  
  253.     if (event == "SPELL_ENERGIZE") then
  254.  
  255.         return false            -- Never want this
  256.  
  257.     end
  258.  
  259. @@ -2073,7 +2073,7 @@
  260.     local gotValid = 0
  261.  
  262.     while (true) do
  263.  
  264.         local color
  265.  
  266. -       local timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags = CombatLogGetCurrentEntry()
  267.  
  268. +       local timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, dstFlags2 = CombatLogGetCurrentEntry()
  269.  
  270.         if (dstName == unitName) then
  271.  
  272.             if (self:OptionalFilters(CombatLogGetCurrentEntry())) then
  273.  
  274.                 if (not self.firstTimeStamp) then
  275.  
  276. @@ -2216,7 +2216,7 @@
  277.  
  278.  
  279.  -- Tip
  280.  
  281.  --function module:Tip(unit, tooltip)
  282.  
  283. -function module:Tip(timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  284.  
  285. +function module:Tip(timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)
  286.  
  287.     local prevUnit = self.lastUnit
  288.  
  289.     local unit, tooltip
  290.  
  291.     if (type(timestamp) == "number") then
  292.  
  293. @@ -2267,7 +2267,7 @@
  294.  
  295.  
  296.     if (timestamp and self.offset == 0) then
  297.  
  298.         local shown = self:ShuffleListUpward(timestamp)
  299.  
  300. -       self:AddLine(timestamp, event, _, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, ...)
  301.  
  302. +       self:AddLine(timestamp, event, _, srcGUID, srcName, srcFlags, srcFlags2, dstGUID, dstName, dstFlags, ...)
  303.  
  304.  
  305.  
  306.         line = shown + 1
  307.  
  308.         self:DoHealth()
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!