Compare commits

...

4 Commits

Author SHA1 Message Date
e36b87a407 Fixed TargetInfo debuffs not having the same frame as buffs 2016-08-31 23:07:54 -05:00
880e2e3278 Added support for the Pain mana type 2016-08-18 23:00:06 -05:00
a5de40f087 Added colors for Maelstrom mana
Fixed TargetMana to use Insanity, Fury, and Maelstrom colors correctly
2016-08-15 23:16:57 -05:00
6090814d4e Fixed error on startup in 7.0 for users with old MaelstromCount, SunderCount, or LacerateCount modules in their settings. 2016-08-15 23:10:58 -05:00
4 changed files with 20 additions and 7 deletions

View File

@ -272,7 +272,7 @@ end
function IceCore.prototype:RedirectRemovedModules()
local _, class = UnitClass("player")
if class == "WARRIOR" and self.settings.modules["SunderCount"] and IceHUD.WowVer < 60000 then
if class == "WARRIOR" and self.settings.modules["SunderCount"] and GetSpellInfo(SUNDER_SPELL_ID) and IceHUD.WowVer < 60000 then
if self.settings.modules["SunderCount"].enabled or self.settings.modules["SunderCount"].enabled == nil then
local bFound = false
@ -309,7 +309,7 @@ function IceCore.prototype:RedirectRemovedModules()
self.settings.modules["SunderCount"] = nil
end
if class == "DRUID" and self.settings.modules["LacerateCount"] then
if class == "DRUID" and self.settings.modules["LacerateCount"] and GetSpellInfo(LACERATE_SPELL_ID) then
if self.settings.modules["LacerateCount"].enabled or self.settings.modules["LacerateCount"].enabled == nil then
local bFound = false
for k,v in pairs(self.elements) do
@ -346,7 +346,7 @@ function IceCore.prototype:RedirectRemovedModules()
self.settings.modules["LacerateCount"] = nil
end
if class == "SHAMAN" and self.settings.modules["MaelstromCount"] then
if class == "SHAMAN" and self.settings.modules["MaelstromCount"] and GetSpellInfo(MAELSTROM_SPELL_ID) then
if self.settings.modules["MaelstromCount"].enabled or self.settings.modules["MaelstromCount"].enabled == nil then
local bFound = false
for k,v in pairs(self.elements) do

View File

@ -19,6 +19,8 @@ function PlayerMana.prototype:init()
if IceHUD.WowVer >= 70000 then
self:SetDefaultColor("PlayerInsanity", 150, 50, 255)
self:SetDefaultColor("PlayerFury", 255, 50, 255)
self:SetDefaultColor("PlayerMaelstrom", 62, 54, 152)
self:SetDefaultColor("PlayerPain", 255, 50, 255)
end
end
@ -245,7 +247,7 @@ end
function PlayerMana.prototype:TreatEmptyAsFull()
return self.manaType == SPELL_POWER_RAGE or self.manaType == SPELL_POWER_RUNIC_POWER
or (IceHUD.WowVer >= 70000 and (self.manaType == SPELL_POWER_LUNAR_POWER or self.manaType == SPELL_POWER_INSANITY
or self.manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_MAELSTROM))
or self.manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_PAIN or self.manaType == SPELL_POWER_MAELSTROM))
end
function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
@ -298,6 +300,10 @@ function PlayerMana.prototype:Update(unit, powertype)
color = "PlayerInsanity"
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_FURY) then
color = "PlayerFury"
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_MAELSTROM) then
color = "PlayerMaelstrom"
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_PAIN) then
color = "PlayerPain"
end
end

View File

@ -1325,6 +1325,7 @@ do
icon:SetHeight(size-2)
end
else
frame.texture:SetTexture(0, 0, 0, 0.5)
icon:SetWidth(size-2)
icon:SetHeight(size-2)
end

View File

@ -21,6 +21,8 @@ function IceTargetMana.prototype:init(moduleName, unit)
if IceHUD.WowVer >= 70000 then
self:SetDefaultColor("TargetInsanity", 150, 50, 255)
self:SetDefaultColor("TargetFury", 255, 50, 255)
self:SetDefaultColor("TargetMaelstrom", 52, 64, 221)
self:SetDefaultColor("TargetPain", 255, 50, 255)
end
end
@ -109,10 +111,14 @@ function IceTargetMana.prototype:Update(unit)
self.color = "TargetEnergy"
elseif (manaType == SPELL_POWER_RUNIC_POWER) then
self.color = "TargetRunicPower"
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_INSANITY) then
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_INSANITY) then
self.color = "TargetInsanity"
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_FURY) then
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_FURY) then
self.color = "TargetFury"
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_MAELSTROM) then
self.color = "TargetMaelstrom"
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_PAIN) then
self.color = "TargetPain"
end
if (self.tapped) then
@ -133,7 +139,7 @@ end
function IceTargetMana.prototype:TreatEmptyAsFull(manaType)
return manaType == SPELL_POWER_RAGE or manaType == SPELL_POWER_RUNIC_POWER
or (IceHUD.WowVer >= 70000 and (manaType == SPELL_POWER_LUNAR_POWER or manaType == SPELL_POWER_INSANITY
or manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_MAELSTROM))
or manaType == SPELL_POWER_FURY or manaType == SPELL_POWER_PAIN or manaType == SPELL_POWER_MAELSTROM))
end
-- OVERRIDE