Compare commits

...

5 Commits
1.9.1 ... 1.9.3

5 changed files with 14 additions and 7 deletions

2
.mailmap Normal file
View File

@ -0,0 +1,2 @@
Parnic <parnic@parnic.com> Parnic <chris@parnic.com>
rokiyo <rokiyo@example.com> Rokiyo <Rokiyo@example.com>

View File

@ -261,12 +261,12 @@ end
function IceCore.prototype:RedirectRemovedModules() function IceCore.prototype:RedirectRemovedModules()
local _, class = UnitClass("player") local _, class = UnitClass("player")
if class == "WARRIOR" and self.settings.modules["SunderCount"] then if class == "WARRIOR" and self.settings.modules["SunderCount"] and IceHUD.WowVer < 60000 then
if self.settings.modules["SunderCount"].enabled or self.settings.modules["SunderCount"].enabled == nil then if self.settings.modules["SunderCount"].enabled or self.settings.modules["SunderCount"].enabled == nil then
local bFound = false local bFound = false
for k,v in pairs(self.elements) do for k,v in pairs(self.elements) do
if v.moduleSettings.customBarType == "Counter" if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(SUNDER_SPELL_ID)) then and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(SUNDER_SPELL_ID)) then
bFound = true bFound = true
break break
@ -302,7 +302,7 @@ function IceCore.prototype:RedirectRemovedModules()
if self.settings.modules["LacerateCount"].enabled or self.settings.modules["LacerateCount"].enabled == nil then if self.settings.modules["LacerateCount"].enabled or self.settings.modules["LacerateCount"].enabled == nil then
local bFound = false local bFound = false
for k,v in pairs(self.elements) do for k,v in pairs(self.elements) do
if v.moduleSettings.customBarType == "Counter" if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(LACERATE_SPELL_ID)) then and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(LACERATE_SPELL_ID)) then
bFound = true bFound = true
break break
@ -339,7 +339,7 @@ function IceCore.prototype:RedirectRemovedModules()
if self.settings.modules["MaelstromCount"].enabled or self.settings.modules["MaelstromCount"].enabled == nil then if self.settings.modules["MaelstromCount"].enabled or self.settings.modules["MaelstromCount"].enabled == nil then
local bFound = false local bFound = false
for k,v in pairs(self.elements) do for k,v in pairs(self.elements) do
if v.moduleSettings.customBarType == "Counter" if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(MAELSTROM_SPELL_ID)) then and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(MAELSTROM_SPELL_ID)) then
bFound = true bFound = true
break break

View File

@ -372,7 +372,7 @@ function IceHUD:GetDebuffCount(unit, ability, onlyMine, matchByName)
end end
function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName) function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
if not unit then if not unit or not ability then
return 0 return 0
end end

View File

@ -549,6 +549,10 @@ end
function IceCustomCount.prototype:UpdateCustomCount() function IceCustomCount.prototype:UpdateCustomCount()
if not self.moduleSettings.auraName then
return
end
local points local points
if IceHUD.IceCore:IsInConfigMode() then if IceHUD.IceCore:IsInConfigMode() then
points = tonumber(self.moduleSettings.maxCount) points = tonumber(self.moduleSettings.maxCount)

View File

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