From 5148bae369e102ef3ecb706fd09df6d94f0cef9a Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sun, 13 Jul 2014 11:29:55 +0000 Subject: [PATCH] Rename "name" field to "spellName" to avoid conflict with AceAddon. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1529 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleBanditsGuile.lua | 4 ++-- OvaleShadowWordDeath.lua | 4 ++-- OvaleSteadyFocus.lua | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OvaleBanditsGuile.lua b/OvaleBanditsGuile.lua index 6c63a28..15e0e78 100644 --- a/OvaleBanditsGuile.lua +++ b/OvaleBanditsGuile.lua @@ -63,7 +63,7 @@ local BANDITS_GUILE_ATTACK = { -- -- -OvaleBanditsGuile.name = "Bandit's Guile" +OvaleBanditsGuile.spellName = "Bandit's Guile" -- Bandit's Guile spell ID from spellbook; re-used as the aura ID of the hidden, stacking buff. OvaleBanditsGuile.spellId = BANDITS_GUILE OvaleBanditsGuile.start = 0 @@ -174,7 +174,7 @@ function OvaleBanditsGuile:Ovale_AuraRemoved(event, timestamp, target, auraId, c end function OvaleBanditsGuile:GainedAura(atTime) - OvaleAura:GainedAuraOnGUID(self_guid, atTime, self.spellId, self_guid, "HELPFUL", nil, nil, self.stacks, nil, self.duration, self.ending, nil, self.name, nil, nil, nil) + OvaleAura:GainedAuraOnGUID(self_guid, atTime, self.spellId, self_guid, "HELPFUL", nil, nil, self.stacks, nil, self.duration, self.ending, nil, self.spellName, nil, nil, nil) end function OvaleBanditsGuile:Debug() diff --git a/OvaleShadowWordDeath.lua b/OvaleShadowWordDeath.lua index c0b35bf..e2a1c91 100644 --- a/OvaleShadowWordDeath.lua +++ b/OvaleShadowWordDeath.lua @@ -43,7 +43,7 @@ local SHADOW_WORD_DEATH = { -- -- -OvaleShadowWordDeath.name = "Shadow Word: Death Reset Cooldown" +OvaleShadowWordDeath.spellName = "Shadow Word: Death Reset Cooldown" OvaleShadowWordDeath.spellId = 157218 -- spell ID to use for the hidden buff OvaleShadowWordDeath.start = 0 OvaleShadowWordDeath.ending = 0 @@ -88,7 +88,7 @@ function OvaleShadowWordDeath:COMBAT_LOG_EVENT_UNFILTERED(event, timestamp, cleu self.start = now self.ending = now + self.duration self.stacks = 1 - OvaleAura:GainedAuraOnGUID(self_guid, self.start, self.spellId, self_guid, "HELPFUL", nil, nil, self.stacks, nil, self.duration, self.ending, nil, self.name, nil, nil, nil) + OvaleAura:GainedAuraOnGUID(self_guid, self.start, self.spellId, self_guid, "HELPFUL", nil, nil, self.stacks, nil, self.duration, self.ending, nil, self.spellName, nil, nil, nil) end end end diff --git a/OvaleSteadyFocus.lua b/OvaleSteadyFocus.lua index d2b9745..4fe13c5 100644 --- a/OvaleSteadyFocus.lua +++ b/OvaleSteadyFocus.lua @@ -73,7 +73,7 @@ local RANGED_ATTACKS_BY_DEBUFF = { -- -- -OvaleSteadyFocus.name = "Pre-Steady Focus" +OvaleSteadyFocus.spellName = "Pre-Steady Focus" -- Steady Focus spell ID from spellbook; re-used as the aura ID of the hidden buff. OvaleSteadyFocus.spellId = 53224 OvaleSteadyFocus.start = 0 @@ -152,7 +152,7 @@ function OvaleSteadyFocus:GainedAura(atTime) self.start = atTime self.ending = self.start + self.duration self.stacks = self.stacks + 1 - OvaleAura:GainedAuraOnGUID(self_guid, self.start, self.spellId, self_guid, "HELPFUL", nil, nil, self.stacks, nil, self.duration, self.ending, nil, self.name, nil, nil, nil) + OvaleAura:GainedAuraOnGUID(self_guid, self.start, self.spellId, self_guid, "HELPFUL", nil, nil, self.stacks, nil, self.duration, self.ending, nil, self.spellName, nil, nil, nil) end function OvaleSteadyFocus:LostAura(atTime) -- 1.7.9.5