Added colors for Maelstrom mana

Fixed TargetMana to use Insanity, Fury, and Maelstrom colors correctly

IceCastBar.lua

@@ -413,30 +413,30 @@ end
 -- NORMAL SPELLS                                                             --
 -------------------------------------------------------------------------------
 
-function IceCastBar.prototype:SpellCastSent(event, unit, spell, rank, target)
+function IceCastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastSent", unit, spell, rank, target)
+	IceHUD:Debug("SpellCastSent", unit, spell, rank, target, lineId)
 end
 
 function IceCastBar.prototype:SpellCastChanged(event, arg1)
 	IceHUD:Debug("SpellCastChanged", arg1)
 end
 
-function IceCastBar.prototype:SpellCastStart(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastStart", unit, spell, rank)
+	IceHUD:Debug("SpellCastStart", unit, spell, rank, lineId, spellId)
 	--UnitCastingInfo(unit)
 
 	self:StartBar(IceCastBar.Actions.Cast)
-	self.current = spell
+	self.current = lineId
 end
 
-function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastStop", unit, spell, self.current)
+	IceHUD:Debug("SpellCastStop", unit, spell, self.current, rank, lineId, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and spell and self.current ~= spell) then
+	if (self.current and lineId and self.current ~= lineId) then
 		return
 	end
 
@@ -450,12 +450,12 @@ function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank)
 end
 
 
-function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastFailed", unit, self.current)
+	IceHUD:Debug("SpellCastFailed", unit, self.current, lineId, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and spell and self.current ~= spell) then
+	if (self.current and lineId and self.current ~= lineId) then
 		return
 	end
 
@@ -478,12 +478,12 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank)
 	self:StartBar(IceCastBar.Actions.Failure, "Failed")
 end
 
-function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastInterrupted", unit, self.current)
+	IceHUD:Debug("SpellCastInterrupted", unit, self.current, lineId, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and spell and self.current ~= spell) then
+	if (self.current and lineId and self.current ~= lineId) then
 		return
 	end
 
@@ -505,7 +505,7 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
 end
 
 
-function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
 	--IceHUD:Debug("SpellCastSucceeded", unit, spell, rank)
 
@@ -515,7 +515,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank)
 	end
 
 	-- ignore if not coming from current spell
-	if (self.current and self.current ~= spell) then
+	if (self.current and self.current ~= lineId) then
 		return
 	end
 

IceCore.lua

@@ -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

modules/CastBar.lua

@@ -404,14 +404,14 @@ end
 
 
 -- OVERRIDE
-function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target)
-	CastBar.super.prototype.SpellCastSent(self, event, unit, spell, rank, target)
+function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
+	CastBar.super.prototype.SpellCastSent(self, event, unit, spell, rank, target, lineId)
 	if (unit ~= self.unit) then return end
 
 	if IceHUD.WowVer < 70000 then
 		self.spellCastSent = GetTime()
 	end
-	self.sentSpell = spell
+	self.sentSpell = lineId
 end
 
 -- OVERRIDE
@@ -423,15 +423,15 @@ function CastBar.prototype:SpellCastChanged(event, arg1)
 end
 
 -- OVERRIDE
-function CastBar.prototype:SpellCastStart(event, unit, spell, rank)
-	CastBar.super.prototype.SpellCastStart(self, event, unit, spell, rank)
+function CastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
+	CastBar.super.prototype.SpellCastStart(self, event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
 
 	if not self:IsVisible() or not self.actionDuration then
 		return
 	end
 
-	if self.sentSpell ~= spell then
+	if self.sentSpell ~= lineId then
 		self.spellCastSent = nil
 	end
 

modules/ClassPowerCounter.lua

@@ -684,11 +684,6 @@ function IceClassPowerCounter.prototype:SetDisplayMode()
 		for i=1, self.numRunes do
 			self:SetupRuneTexture(i)
 			self.frame.graphical[i]:Show()
-			if self.moduleSettings.inactiveDisplayMode == "Darkened" then
-				self.frame.graphical[i].runebg:Show()
-			else
-				self.frame.graphical[i].runebg:Hide()
-			end
 		end
 	end
 end
@@ -723,8 +718,6 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 
 		self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "ARTWORK")
 		self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
-		self.frame.graphical[i].runebg = self.frame.graphical[i]:CreateTexture(nil, "BACKGROUND")
-		self.frame.graphical[i].runebg:SetVertexColor(0, 0, 0)
 		self:SetupRuneTexture(i)
 
 		self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
@@ -749,14 +742,10 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 	self.frame.graphical[i]:SetHeight(self.runeHeight)
 	self.frame.graphical[i].rune:SetWidth(self.runeWidth)
 	self.frame.graphical[i].rune:SetHeight(self.runeHeight)
-	self.frame.graphical[i].runebg:SetWidth(self.runeWidth)
-	self.frame.graphical[i].runebg:SetHeight(self.runeHeight)
 	if self.currentGrowMode == self.growModes["width"] then
 		self.frame.graphical[i].rune:SetPoint("LEFT", self.frame.graphical[i], "LEFT")
-		self.frame.graphical[i].runebg:SetPoint("LEFT", self.frame.graphical[i], "LEFT")
 	else
 		self.frame.graphical[i].rune:SetPoint("BOTTOM", self.frame.graphical[i], "BOTTOM")
-		self.frame.graphical[i].runebg:SetPoint("BOTTOM", self.frame.graphical[i], "BOTTOM")
 	end
 end
 
@@ -774,7 +763,6 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 
 	-- make sure any texture aside from the special one is square and has the proper coordinates
 	self.frame.graphical[rune].rune:SetTexCoord(a, b, c, d)
-	self.frame.graphical[rune].runebg:SetTexCoord(a, b, c, d)
 	self.frame.graphical[rune]:SetWidth(width)
 	self.frame:SetWidth(width*self.numRunes)
 	local runeAdjust = rune - (self.numRunes / 2) - 0.5
@@ -784,8 +772,8 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 		self.frame.graphical[rune]:SetPoint("CENTER", 0, -1 * (runeAdjust * (self.runeHeight-5) + runeAdjust + (runeAdjust * self.moduleSettings.runeGap)))
 	end
 
-	local tex = self:GetRuneTexture(rune)
 	if self:GetRuneMode() == "Graphical" then
+		local tex = self:GetRuneTexture(rune)
 		if tex then
 			self.frame.graphical[rune].rune:SetTexture(tex)
 		else
@@ -800,11 +788,6 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 	elseif self:GetRuneMode() == "Graphical Clean Circle" then
 		self.frame.graphical[rune].rune:SetTexture(IceElement.TexturePath .. "ComboCleanCurves")
 	end
-	if tex then
-		self.frame.graphical[rune].runebg:SetTexture(tex)
-	else
-		self.frame.graphical[rune].runebg:SetAtlas(self.frame.graphical[rune].rune:GetAtlas())
-	end
 end
 
 function IceClassPowerCounter.prototype:GetAlphaAdd()

modules/PlayerAbsorb.lua

@@ -17,11 +17,5 @@ function PlayerAbsorb.prototype:GetDefaultSettings()
 	return settings
 end
 
-function PlayerAbsorb.prototype:MyRegisterCustomEvents()
-end
-
-function PlayerAbsorb.prototype:MyUnregisterCustomEvents()
-end
-
 -- Load us up
 IceHUD.PlayerAbsorb = PlayerAbsorb:new()

modules/PlayerMana.lua

@@ -19,6 +19,7 @@ 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)
 	end
 end
 
@@ -245,7 +246,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_FURY or self.manaType == SPELL_POWER_MAELSTROM))
 end
 
 function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
@@ -298,6 +299,8 @@ 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"
 		end
 	end
 

modules/Resolve.lua

@@ -80,6 +80,6 @@ end
 -- Load for tanks only
 local _, unitClass = UnitClass("player")
 if ((unitClass == "DEATHKNIGHT" or unitClass == "DRUID" or unitClass == "PALADIN" or unitClass == "WARRIOR" or unitClass == "MONK")
-	and IceHUD.WowVer >= 60000) then
+	and IceHUD.WowVer >= 60000 and IceHUD.WowVer < 70000) then
   IceHUD.Resolve = Resolve:new()
 end

modules/TargetAbsorb.lua

@@ -4,13 +4,8 @@ IceTargetAbsorb.prototype.highestAbsorbSinceLastZero = 0
 IceTargetAbsorb.prototype.ColorName = "TargetAbsorb"
 
 local UnitGetTotalAbsorbs = UnitGetTotalAbsorbs
-if IceHUD.WowVer < 50200 then
-	UnitGetTotalAbsorbs = nil
-end
 
--- Constructor --
 function IceTargetAbsorb.prototype:init(moduleName, unit, colorName)
-	-- not sure if this is necessary...i think it is...this way, we can instantiate this bar on its own or as a parent class
 	if moduleName == nil or unit == nil then
 		IceTargetAbsorb.super.prototype.init(self, "TargetAbsorb", "target")
 	else
@@ -29,45 +24,46 @@ function IceTargetAbsorb.prototype:GetDefaultSettings()
 
 	settings["side"] = IceCore.Side.Right
 	settings["offset"] = 3
-	settings["upperText"] = "[TotalAbsorb]"
+	settings["upperText"] = "[TotalAbsorb:VeryShort]"
 
 	return settings
 end
 
--- OVERRIDE
 function IceTargetAbsorb.prototype:Enable(core)
 	IceTargetAbsorb.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
 	self:MyRegisterCustomEvents()
 
-	self:UpdateAbsorbAmount("UNIT_ABSORB_AMOUNT_CHANGED", self.unit)
+	self:UpdateAbsorbAmount()
 
 	self:Show(false)
 end
 
 function IceTargetAbsorb.prototype:MyRegisterCustomEvents()
-	self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateAbsorbAmount")
 end
 
 function IceTargetAbsorb.prototype:MyUnregisterCustomEvents()
-	self:UnregisterEvent("PLAYER_TARGET_CHANGED")
+end
+
+function IceTargetAbsorb.prototype:Update()
+	self:UpdateAbsorbAmount()
 end
 
 function IceTargetAbsorb.prototype:UpdateAbsorbAmount(event, unit)
-	if UnitGetTotalAbsorbs == nil or (event == "UNIT_ABSORB_AMOUNT_CHANGED" and unit ~= self.unit) then
+	if event == "UNIT_ABSORB_AMOUNT_CHANGED" and unit ~= self.unit then
 		return
 	end
 
-	local absorbAmount = UnitGetTotalAbsorbs(self.unit)
+	local absorbAmount = UnitGetTotalAbsorbs(self.unit) or 0
 
-	if absorbAmount == nil or absorbAmount <= 0 then
+	if absorbAmount <= 0 then
 		self.highestAbsorbSinceLastZero = 0
 	elseif absorbAmount > self.highestAbsorbSinceLastZero then
 		self.highestAbsorbSinceLastZero = absorbAmount
 	end
 
-	if absorbAmount == nil or absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
+	if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
 		self:Show(false)
 	else
 		self:Show(true)
@@ -82,4 +78,6 @@ function IceTargetAbsorb.prototype:Disable(core)
 	self:MyUnregisterCustomEvents()
 end
 
-IceHUD.TargetAbsorb = IceTargetAbsorb:new()
+if UnitGetTotalAbsorbs ~= nil then
+	IceHUD.TargetAbsorb = IceTargetAbsorb:new()
+end

modules/TargetMana.lua

@@ -21,6 +21,7 @@ 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)
 	end
 end
 
@@ -109,10 +110,12 @@ 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"
 		end
 
 		if (self.tapped) then
@@ -133,7 +136,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 manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_MAELSTROM))
 end
 
 -- OVERRIDE