mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 22:51:53 -05:00
Compare commits
51 Commits
Author | SHA1 | Date | |
---|---|---|---|
9764694568
|
|||
337bd72545
|
|||
c4d35b9766
|
|||
7dfe505db2
|
|||
a8f175fad4
|
|||
1591b36e89
|
|||
8ddc6c5911
|
|||
bbab772044
|
|||
d27fb83f02
|
|||
59e8ac2de8
|
|||
ef9fcdf29b
|
|||
ac8effb177
|
|||
b89bc5516e
|
|||
5ae7771fea
|
|||
0d146ab10f
|
|||
02ad6253d3 | |||
6445b424b3 | |||
383b7cae2f | |||
62201381c5 | |||
161b0215be | |||
11ef3354f0 | |||
be64b56da6 | |||
4a6868a906 | |||
47362d4cb0 | |||
26502214b2 | |||
ee3d107863 | |||
beb080b104 | |||
2d48f3a24c | |||
5605fcbc2b | |||
7ebe7a05d7 | |||
bb4d7640ed | |||
388e314371 | |||
89ef91b9b3 | |||
0f7a2ff4f1 | |||
3ea273fe47 | |||
5003608a34 | |||
c21fe96707 | |||
d108ac9e2e | |||
6c4e815b9e | |||
46daddbed9 | |||
1b64adc77c | |||
35e56ebec6 | |||
5fe8776249 | |||
08e8d3a087 | |||
2eae8fa419 | |||
94850e53dd | |||
a739b7ba99 | |||
176603ec51 | |||
0cdfde1758 | |||
2f7b081790 | |||
b7883036fd |
@ -171,6 +171,7 @@ function IceBarElement.prototype:GetDefaultSettings()
|
|||||||
settings["rotateBar"] = false
|
settings["rotateBar"] = false
|
||||||
settings["markers"] = {}
|
settings["markers"] = {}
|
||||||
settings["bAllowExpand"] = true
|
settings["bAllowExpand"] = true
|
||||||
|
settings["textVerticalGap"] = 0
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
@ -724,6 +725,26 @@ do
|
|||||||
order = 11.3,
|
order = 11.3,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
textVerticalGap = {
|
||||||
|
type = 'range',
|
||||||
|
name = L["Text Vertical Gap"],
|
||||||
|
desc = L["Gap between Upper and Lower text vertically"],
|
||||||
|
min = 0,
|
||||||
|
max = 10,
|
||||||
|
step = 1,
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.textVerticalGap
|
||||||
|
end,
|
||||||
|
set = function(info, v)
|
||||||
|
self.moduleSettings.textVerticalGap = v
|
||||||
|
self:Redraw()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
order = 11.4,
|
||||||
|
},
|
||||||
|
|
||||||
textHeader = {
|
textHeader = {
|
||||||
type = 'header',
|
type = 'header',
|
||||||
name = L["Upper Text"],
|
name = L["Upper Text"],
|
||||||
@ -1116,8 +1137,13 @@ function IceBarElement.prototype:CreateTexts()
|
|||||||
offy = self.moduleSettings.textVerticalOffset
|
offy = self.moduleSettings.textVerticalOffset
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local offgap = 0
|
||||||
|
if self.moduleSettings.textVerticalGap ~= nil then
|
||||||
|
offgap = self.moduleSettings.textVerticalGap
|
||||||
|
end
|
||||||
|
|
||||||
self.frame.bottomUpperText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy)
|
self.frame.bottomUpperText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy)
|
||||||
self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - 14)
|
self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - (14 + offgap))
|
||||||
|
|
||||||
if (self.moduleSettings.textVisible["upper"]) then
|
if (self.moduleSettings.textVisible["upper"]) then
|
||||||
self.frame.bottomUpperText:Show()
|
self.frame.bottomUpperText:Show()
|
||||||
@ -1433,6 +1459,16 @@ function IceBarElement.prototype:SetScaledColor(colorVar, percent, maxColor, min
|
|||||||
colorVar.b = ((maxColor.b - minColor.b) * percent) + minColor.b
|
colorVar.b = ((maxColor.b - minColor.b) * percent) + minColor.b
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceBarElement.prototype:Round(num)
|
||||||
|
if (num > 1000000) then
|
||||||
|
return IceHUD:MathRound(num/1000000, 1) .. "M"
|
||||||
|
end
|
||||||
|
if (num > 1000) then
|
||||||
|
return IceHUD:MathRound(num/1000, 1) .. "k"
|
||||||
|
end
|
||||||
|
return num
|
||||||
|
end
|
||||||
|
|
||||||
-- To be overridden
|
-- To be overridden
|
||||||
function IceBarElement.prototype:Update()
|
function IceBarElement.prototype:Update()
|
||||||
end
|
end
|
||||||
|
@ -12,6 +12,11 @@ IceCastBar.prototype.actionMessage = nil
|
|||||||
IceCastBar.prototype.unit = nil
|
IceCastBar.prototype.unit = nil
|
||||||
IceCastBar.prototype.current = nil
|
IceCastBar.prototype.current = nil
|
||||||
|
|
||||||
|
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||||
|
end
|
||||||
|
|
||||||
local AuraIconWidth = 20
|
local AuraIconWidth = 20
|
||||||
local AuraIconHeight = 20
|
local AuraIconHeight = 20
|
||||||
|
|
||||||
@ -86,7 +91,7 @@ function IceCastBar.prototype:GetOptions()
|
|||||||
end,
|
end,
|
||||||
order = 39.998
|
order = 39.998
|
||||||
}
|
}
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
opts["showSpellRank"] =
|
opts["showSpellRank"] =
|
||||||
{
|
{
|
||||||
type = 'toggle',
|
type = 'toggle',
|
||||||
@ -103,7 +108,7 @@ function IceCastBar.prototype:GetOptions()
|
|||||||
end,
|
end,
|
||||||
order = 39.999
|
order = 39.999
|
||||||
}
|
}
|
||||||
|
end
|
||||||
opts["iconSettings"] = {
|
opts["iconSettings"] = {
|
||||||
type = 'group',
|
type = 'group',
|
||||||
name = "|c"..self.configColor..L["Icon Settings"].."|r",
|
name = "|c"..self.configColor..L["Icon Settings"].."|r",
|
||||||
@ -346,9 +351,18 @@ end
|
|||||||
|
|
||||||
|
|
||||||
function IceCastBar.prototype:StartBar(action, message)
|
function IceCastBar.prototype:StartBar(action, message)
|
||||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
||||||
|
else
|
||||||
|
spell, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
||||||
|
end
|
||||||
if not (spell) then
|
if not (spell) then
|
||||||
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
if IceHUD.WowVer < 80000 then
|
||||||
|
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
||||||
|
else
|
||||||
|
spell, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if not spell then
|
if not spell then
|
||||||
@ -398,7 +412,7 @@ function IceCastBar.prototype:StopBar()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:GetShortRank(rank)
|
function IceCastBar.prototype:GetShortRank(rank)
|
||||||
if (rank) then
|
if IceHUD.WowVer < 80000 and rank then
|
||||||
local _, _, sRank = string.find(rank, "(%d+)")
|
local _, _, sRank = string.find(rank, "(%d+)")
|
||||||
if (sRank) then
|
if (sRank) then
|
||||||
return " (" .. sRank .. ")"
|
return " (" .. sRank .. ")"
|
||||||
@ -413,30 +427,30 @@ end
|
|||||||
-- NORMAL SPELLS --
|
-- NORMAL SPELLS --
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
|
function IceCastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
IceHUD:Debug("SpellCastSent", unit, spell, rank, target, lineId)
|
IceHUD:Debug("SpellCastSent", unit, target, castGuid, spellId)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastChanged(event, arg1)
|
function IceCastBar.prototype:SpellCastChanged(event, cancelled)
|
||||||
IceHUD:Debug("SpellCastChanged", arg1)
|
IceHUD:Debug("SpellCastChanged", cancelled)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
|
function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
IceHUD:Debug("SpellCastStart", unit, spell, rank, lineId, spellId)
|
IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
|
||||||
--UnitCastingInfo(unit)
|
--UnitCastingInfo(unit)
|
||||||
|
|
||||||
self:StartBar(IceCastBar.Actions.Cast)
|
self:StartBar(IceCastBar.Actions.Cast)
|
||||||
self.current = lineId
|
self.current = castGuid
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, spellId)
|
function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
IceHUD:Debug("SpellCastStop", unit, spell, self.current, rank, lineId, spellId)
|
IceHUD:Debug("SpellCastStop", unit, castGuid, spellId)
|
||||||
|
|
||||||
-- ignore if not coming from current spell
|
-- ignore if not coming from current spell
|
||||||
if (self.current and lineId and self.current ~= lineId) then
|
if (self.current and castGuid and self.current ~= castGuid) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -450,12 +464,12 @@ function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, sp
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId, spellId)
|
function IceCastBar.prototype:SpellCastFailed(event, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
IceHUD:Debug("SpellCastFailed", unit, self.current, lineId, spellId)
|
IceHUD:Debug("SpellCastFailed", unit, castGuid, spellId)
|
||||||
|
|
||||||
-- ignore if not coming from current spell
|
-- ignore if not coming from current spell
|
||||||
if (self.current and lineId and self.current ~= lineId) then
|
if (self.current and castGuid and self.current ~= castGuid) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -478,12 +492,12 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId,
|
|||||||
self:StartBar(IceCastBar.Actions.Failure, "Failed")
|
self:StartBar(IceCastBar.Actions.Failure, "Failed")
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lineId, spellId)
|
function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
IceHUD:Debug("SpellCastInterrupted", unit, self.current, lineId, spellId)
|
IceHUD:Debug("SpellCastInterrupted", unit, castGuid, spellId)
|
||||||
|
|
||||||
-- ignore if not coming from current spell
|
-- ignore if not coming from current spell
|
||||||
if (self.current and lineId and self.current ~= lineId) then
|
if (self.current and castGuid and self.current ~= castGuid) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -492,11 +506,11 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lin
|
|||||||
self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
|
self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
|
function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
--IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit))
|
--IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit))
|
||||||
|
|
||||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
local endTime = select(IceHUD.WowVer < 80000 and 6 or 5, UnitCastingInfo(self.unit))
|
||||||
|
|
||||||
if (endTime and self.actionStartTime) then
|
if (endTime and self.actionStartTime) then
|
||||||
-- apparently this check is needed, got nils during a horrible lag spike
|
-- apparently this check is needed, got nils during a horrible lag spike
|
||||||
@ -505,9 +519,9 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineId, spellId)
|
function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
--IceHUD:Debug("SpellCastSucceeded", unit, spell, rank)
|
--IceHUD:Debug("SpellCastSucceeded", unit, castGuid, spellId)
|
||||||
|
|
||||||
-- never show on channeled (why on earth does this event even fire when channeling starts?)
|
-- never show on channeled (why on earth does this event even fire when channeling starts?)
|
||||||
if (self.action == IceCastBar.Actions.Channel) then
|
if (self.action == IceCastBar.Actions.Channel) then
|
||||||
@ -515,10 +529,12 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineI
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- ignore if not coming from current spell
|
-- ignore if not coming from current spell
|
||||||
if (self.current and self.current ~= lineId) then
|
if (self.current and self.current ~= castGuid) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local spell = GetSpellInfo(spellId)
|
||||||
|
|
||||||
-- show after normal successfull cast
|
-- show after normal successfull cast
|
||||||
if (self.action == IceCastBar.Actions.Cast) then
|
if (self.action == IceCastBar.Actions.Cast) then
|
||||||
self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
|
self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
|
||||||
@ -554,7 +570,12 @@ function IceCastBar.prototype:SpellCastChannelUpdate(event, unit)
|
|||||||
if (unit ~= self.unit or not self.actionStartTime) then return end
|
if (unit ~= self.unit or not self.actionStartTime) then return end
|
||||||
--IceHUD:Debug("SpellCastChannelUpdate", unit, UnitChannelInfo(unit))
|
--IceHUD:Debug("SpellCastChannelUpdate", unit, UnitChannelInfo(unit))
|
||||||
|
|
||||||
local spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
local spell, rank, displayName, icon, startTime, endTime
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
||||||
|
else
|
||||||
|
spell, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
||||||
|
end
|
||||||
if not spell then
|
if not spell then
|
||||||
self.actionDuration = 0
|
self.actionDuration = 0
|
||||||
else
|
else
|
||||||
|
@ -173,6 +173,13 @@ function IceCore.prototype:CheckDisplayUpdateMessage()
|
|||||||
self.settings.modules["DruidMana"] = nil
|
self.settings.modules["DruidMana"] = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if self.accountSettings.lastRunVersion <= 20180720033008 then
|
||||||
|
if self.settings.modules["HarmonyPower"] ~= nil then
|
||||||
|
self.settings.modules["Chi"] = self.settings.modules["HarmonyPower"]
|
||||||
|
self.settings.modules["HarmonyPower"] = nil
|
||||||
|
self.settings.colors["ChiNumeric"] = self.settings.colors["HarmonyPowerNumeric"]
|
||||||
|
end
|
||||||
|
end
|
||||||
self.accountSettings.lastRunVersion = thisVersion
|
self.accountSettings.lastRunVersion = thisVersion
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
32
IceHUD.lua
32
IceHUD.lua
@ -18,6 +18,8 @@ IceHUD.debugging = false
|
|||||||
|
|
||||||
IceHUD.WowVer = select(4, GetBuildInfo())
|
IceHUD.WowVer = select(4, GetBuildInfo())
|
||||||
|
|
||||||
|
IceHUD.UnitPowerEvent = IceHUD.WowVer < 80000 and "UNIT_POWER" or "UNIT_POWER_UPDATE"
|
||||||
|
|
||||||
IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc",
|
IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc",
|
||||||
"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
|
"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
|
||||||
IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Cooldown bar", Health="Health bar", Mana="Mana bar", CounterBar="Stack count bar"}
|
IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Cooldown bar", Health="Health bar", Mana="Mana bar", CounterBar="Stack count bar"}
|
||||||
@ -409,7 +411,12 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local i = 1
|
local i = 1
|
||||||
local name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
local name, _, texture, applications
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||||
|
else
|
||||||
|
name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||||
|
end
|
||||||
while name do
|
while name do
|
||||||
if (not matchByName and string.match(texture:upper(), ability:upper()))
|
if (not matchByName and string.match(texture:upper(), ability:upper()))
|
||||||
or (matchByName and string.match(name:upper(), ability:upper())) then
|
or (matchByName and string.match(name:upper(), ability:upper())) then
|
||||||
@ -417,7 +424,11 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
|
|||||||
end
|
end
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
if IceHUD.WowVer < 80000 then
|
||||||
|
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||||
|
else
|
||||||
|
name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
@ -432,7 +443,12 @@ do
|
|||||||
end
|
end
|
||||||
|
|
||||||
local i = 1
|
local i = 1
|
||||||
local name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
local name, _, texture, applications, _, _, _, _, _, _, auraID
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
||||||
|
else
|
||||||
|
name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
||||||
|
end
|
||||||
while name do
|
while name do
|
||||||
for i=1, #spellIDs do
|
for i=1, #spellIDs do
|
||||||
if spellIDs[i] == auraID then
|
if spellIDs[i] == auraID then
|
||||||
@ -442,7 +458,11 @@ do
|
|||||||
end
|
end
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
if IceHUD.WowVer < 80000 then
|
||||||
|
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
||||||
|
else
|
||||||
|
name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return retval
|
return retval
|
||||||
@ -724,7 +744,9 @@ local function figure_unit_menu(unit)
|
|||||||
end
|
end
|
||||||
|
|
||||||
IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
|
IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
|
||||||
UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
|
if UnitPopupFrames then
|
||||||
|
UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
|
||||||
|
end
|
||||||
|
|
||||||
IceHUD.DropdownUnit = nil
|
IceHUD.DropdownUnit = nil
|
||||||
UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()
|
UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
## Interface: 70100
|
## Interface: 80000
|
||||||
## Author: Parnic, originally created by Iceroth
|
## Author: Parnic, originally created by Iceroth
|
||||||
## Name: IceHUD
|
## Name: IceHUD
|
||||||
## Title: IceHUD |cff7fff7f-Ace3-|r
|
## Title: IceHUD |cff7fff7f-Ace3-|r
|
||||||
@ -6,7 +6,6 @@
|
|||||||
## Version: @project-version@
|
## Version: @project-version@
|
||||||
## SavedVariables: IceCoreDB
|
## SavedVariables: IceCoreDB
|
||||||
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
|
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
|
||||||
## X-Compatible-With: 70000
|
|
||||||
## X-Category: HUDs
|
## X-Category: HUDs
|
||||||
## X-Website: https://www.wowace.com/projects/ice-hud
|
## X-Website: https://www.wowace.com/projects/ice-hud
|
||||||
## X-WoWI-ID: 8149
|
## X-WoWI-ID: 8149
|
||||||
@ -29,7 +28,6 @@ IceCastBar.lua
|
|||||||
IceStackCounter.lua
|
IceStackCounter.lua
|
||||||
|
|
||||||
# IceHUD modules
|
# IceHUD modules
|
||||||
# - Feel free to comment these out if you like
|
|
||||||
modules\PlayerHealth.lua
|
modules\PlayerHealth.lua
|
||||||
modules\PlayerMana.lua
|
modules\PlayerMana.lua
|
||||||
modules\TargetHealth.lua
|
modules\TargetHealth.lua
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
## Interface: 70100
|
## Interface: 80000
|
||||||
## Title: IceHUD |cff7fff7f-Options-|r
|
## Title: IceHUD |cff7fff7f-Options-|r
|
||||||
## Author: Parnic
|
## Author: Parnic
|
||||||
## Version: @project-version@
|
## Version: @project-version@
|
||||||
|
@ -71,7 +71,7 @@ This isn't |cff9999ffIceHUD|r - it's Blizzard's Spell Alerts they added in 4.0.1
|
|||||||
Expand "|cffffdc42Module Settings|r", expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
|
Expand "|cffffdc42Module Settings|r", expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
|
||||||
|
|
||||||
|cff9999ff14. Which module displays Monk Chi power?|r
|
|cff9999ff14. Which module displays Monk Chi power?|r
|
||||||
This module is called |cffdcff42HarmonyPower|r. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. I feel like it's too late to change now that many people are familiar with the Harmony name.
|
Prior to |cff9999ffIceHUD|r v1.11.2, this module was called |cffdcff42HarmonyPower|r. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. |cff9999ffIceHUD|r v1.11.2 changed this module to be called |cffdcff42Chi|r.
|
||||||
|
|
||||||
|cff9999ff15. How do I add commas/periods into big numbers like health?|r
|
|cff9999ff15. How do I add commas/periods into big numbers like health?|r
|
||||||
If you have |cff42ffffDogTags|r enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
|
If you have |cff42ffffDogTags|r enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
|
||||||
|
@ -128,7 +128,9 @@ end
|
|||||||
function IceStackCounter_Enable(frame)
|
function IceStackCounter_Enable(frame)
|
||||||
frame:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
|
frame:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
|
||||||
frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
|
frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
|
||||||
frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
|
||||||
|
end
|
||||||
frame:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
|
frame:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
|
||||||
frame:RegisterEvent("PLAYER_DEAD", "UpdateCustomCount")
|
frame:RegisterEvent("PLAYER_DEAD", "UpdateCustomCount")
|
||||||
frame:RegisterEvent("SPELL_UPDATE_CHARGES", "UpdateCustomCount")
|
frame:RegisterEvent("SPELL_UPDATE_CHARGES", "UpdateCustomCount")
|
||||||
|
@ -19,6 +19,11 @@ IceUnitBar.prototype.hasPet = nil
|
|||||||
|
|
||||||
IceUnitBar.prototype.noFlash = nil
|
IceUnitBar.prototype.noFlash = nil
|
||||||
|
|
||||||
|
local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function IceUnitBar.prototype:init(name, unit)
|
function IceUnitBar.prototype:init(name, unit)
|
||||||
IceUnitBar.super.prototype.init(self, name)
|
IceUnitBar.super.prototype.init(self, name)
|
||||||
@ -227,6 +232,10 @@ function IceUnitBar.prototype:Update()
|
|||||||
|
|
||||||
self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
|
self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
|
||||||
self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
|
self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
|
||||||
|
if IceHUD.WowVer >= 70300 and UnitPowerType(self.unit) == SPELL_POWER_INSANITY then
|
||||||
|
self.mana = IceHUD:MathRound(self.mana / 100)
|
||||||
|
self.maxMana = IceHUD:MathRound(self.maxMana / 100)
|
||||||
|
end
|
||||||
self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
|
self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
|
||||||
|
|
||||||
local locClass
|
local locClass
|
||||||
|
@ -1,3 +1,58 @@
|
|||||||
|
v1.11.4:
|
||||||
|
- Fixed cast lag indicator updating randomly mid-cast.
|
||||||
|
|
||||||
|
v1.11.3:
|
||||||
|
- Balance druids with Nature's Wrath now treat 50-100 astral power as full for alpha purposes (so the bar will fade to "out of combat" levels when resting around 50%).
|
||||||
|
- Fixed the GCD and player castbar lag indicator to show up again.
|
||||||
|
- Fixed a longstanding bug where the castbar lag indicator would sometimes be the size of the full bar if the mod never received the client-side "started casting" notification.
|
||||||
|
- Improved reliability of castbar lag indicator. Blizzard doesn't offer the necessary events to display this with 100% certainty.
|
||||||
|
- Fixed an error caused by the Runes module when toggling "Hide Blizzard Frame" off.
|
||||||
|
|
||||||
|
v1.11.2:
|
||||||
|
- Fixed Stagger bar to work in 8.0
|
||||||
|
- Fixed DK Runes in graphical mode not always correctly showing runes on cooldown (curse ticket 238, thanks ithorazei!)
|
||||||
|
- Renamed HarmonyPower module to Chi and moved saved settings over
|
||||||
|
|
||||||
|
v1.11.1:
|
||||||
|
- Fixed error when playing as a Monk
|
||||||
|
- Fixed castbar sometimes showing gibberish text and sometimes disappearing when the cast wasn't complete yet
|
||||||
|
|
||||||
|
v1.11.0:
|
||||||
|
- Updated TOC for 8.0
|
||||||
|
|
||||||
|
v1.10.18:
|
||||||
|
- BfA compatibility
|
||||||
|
- Added gap setting between upper and lower text (github pull request #1, thanks lrds!)
|
||||||
|
- Fixed Roll the Bones coloring when gaining 5 buffs.
|
||||||
|
|
||||||
|
v1.10.17:
|
||||||
|
- Fixed Insanity display with DogTags disabled
|
||||||
|
- Show text on Absorb and AltMana with DogTags disabled
|
||||||
|
|
||||||
|
v1.10.16.1:
|
||||||
|
- Added option to hide the raid icon for Info frames.
|
||||||
|
- Updated TOC for 7.3
|
||||||
|
|
||||||
|
v1.10.16:
|
||||||
|
- Updated shard texture for Warlocks.
|
||||||
|
|
||||||
|
v1.10.15.2:
|
||||||
|
- Updated shard display for Destro Warlocks (ticket #234, thanks stencil!).
|
||||||
|
|
||||||
|
v1.10.15.1:
|
||||||
|
- Fixed an error in IceHUD's usage of GetLFGProposal()'s return values exposed by the 7.2.5 Chromie quests.
|
||||||
|
|
||||||
|
v1.10.15:
|
||||||
|
- Fixed error on 7.2 due to a CVar being removed.
|
||||||
|
- Updated TOC for 7.2
|
||||||
|
|
||||||
|
v1.10.14:
|
||||||
|
- Fixed Holy Word: Serenity not being trackable in the Custom Cooldown module (ticket #232).
|
||||||
|
- Updated Stagger bar to allow the user to set the max to 100% if desired.
|
||||||
|
|
||||||
|
v1.10.13.1:
|
||||||
|
- Fixed "0" showing up for some users after 1.10.13 by adding a "show when zero" checkbox to custom counters (disabled by default). Anyone who has used IceHUD for a very long time has automatically-converted custom counter modules that replaced the old "maelstrom", "lacerate", and "sunder" modules that used to exist, each of which exhibited the behavior after the last update.
|
||||||
|
|
||||||
v1.10.13:
|
v1.10.13:
|
||||||
- Fixed alpha settings for spell charges on custom counter bars and stack counters to treat "full" the same way a Mana or Health bar would. Previously these treated "full" as "empty" for charges because that's how buff/debuff stacking should work (ticket #231).
|
- Fixed alpha settings for spell charges on custom counter bars and stack counters to treat "full" the same way a Mana or Health bar would. Previously these treated "full" as "empty" for charges because that's how buff/debuff stacking should work (ticket #231).
|
||||||
- Fixed custom counters in numeric mode not hiding the count properly.
|
- Fixed custom counters in numeric mode not hiding the count properly.
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
|
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
|
||||||
|
<!--@non-debug@
|
||||||
<Script file="libs\LibStub\LibStub.lua"/>
|
<Script file="libs\LibStub\LibStub.lua"/>
|
||||||
<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
|
<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
|
||||||
<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
|
<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
|
||||||
@ -18,4 +19,5 @@
|
|||||||
<Script file="LibDataBroker-1.1.lua"/>
|
<Script file="LibDataBroker-1.1.lua"/>
|
||||||
<Script file="libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
|
<Script file="libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
|
||||||
<Script file="libs\LibDualSpec-1.0\LibDualSpec-1.0.lua"/>
|
<Script file="libs\LibDualSpec-1.0\LibDualSpec-1.0.lua"/>
|
||||||
|
@end-non-debug@-->
|
||||||
</Ui>
|
</Ui>
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
local ArcaneCharges = IceCore_CreateClass(IceClassPowerCounter)
|
local ArcaneCharges = IceCore_CreateClass(IceClassPowerCounter)
|
||||||
|
|
||||||
|
local SPELL_POWER_ARCANE_CHARGES = SPELL_POWER_ARCANE_CHARGES
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_ARCANE_CHARGES = Enum.PowerType.ArcaneCharges
|
||||||
|
end
|
||||||
|
|
||||||
function ArcaneCharges.prototype:init()
|
function ArcaneCharges.prototype:init()
|
||||||
ArcaneCharges.super.prototype.init(self, "ArcaneCharges")
|
ArcaneCharges.super.prototype.init(self, "ArcaneCharges")
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@ local CastBar = IceCore_CreateClass(IceCastBar)
|
|||||||
local IceHUD = _G.IceHUD
|
local IceHUD = _G.IceHUD
|
||||||
|
|
||||||
CastBar.prototype.spellCastSent = nil
|
CastBar.prototype.spellCastSent = nil
|
||||||
CastBar.prototype.sentSpell = nil
|
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function CastBar.prototype:init()
|
function CastBar.prototype:init()
|
||||||
@ -358,7 +357,10 @@ end
|
|||||||
|
|
||||||
function CastBar.prototype:CVarUpdate(...)
|
function CastBar.prototype:CVarUpdate(...)
|
||||||
self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
|
self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
|
||||||
self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000
|
local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
|
||||||
|
if recoveryOffset ~= nil then
|
||||||
|
self.fixedLatency = tonumber(recoveryOffset) / 1000
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function CastBar.prototype:Disable(core)
|
function CastBar.prototype:Disable(core)
|
||||||
@ -391,7 +393,9 @@ end
|
|||||||
|
|
||||||
|
|
||||||
function CastBar.prototype:CreateLagBar()
|
function CastBar.prototype:CreateLagBar()
|
||||||
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY")
|
if self.lagBar == nil then
|
||||||
|
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY")
|
||||||
|
end
|
||||||
|
|
||||||
local r, g, b = self:GetColor("CastLag")
|
local r, g, b = self:GetColor("CastLag")
|
||||||
if (self.settings.backgroundToggle) then
|
if (self.settings.backgroundToggle) then
|
||||||
@ -404,14 +408,13 @@ end
|
|||||||
|
|
||||||
|
|
||||||
-- OVERRIDE
|
-- OVERRIDE
|
||||||
function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
|
function CastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
|
||||||
CastBar.super.prototype.SpellCastSent(self, event, unit, spell, rank, target, lineId)
|
CastBar.super.prototype.SpellCastSent(self, event, unit, target, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
|
|
||||||
if IceHUD.WowVer < 70000 then
|
if IceHUD.WowVer < 70000 then
|
||||||
self.spellCastSent = GetTime()
|
self.spellCastSent = GetTime()
|
||||||
end
|
end
|
||||||
self.sentSpell = lineId
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- OVERRIDE
|
-- OVERRIDE
|
||||||
@ -423,32 +426,16 @@ function CastBar.prototype:SpellCastChanged(event, arg1)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- OVERRIDE
|
-- OVERRIDE
|
||||||
function CastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
|
function CastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
|
||||||
CastBar.super.prototype.SpellCastStart(self, event, unit, spell, rank, lineId, spellId)
|
CastBar.super.prototype.SpellCastStart(self, event, unit, castGuid, spellId)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit or not spellId) then return end
|
||||||
|
|
||||||
if not self:IsVisible() or not self.actionDuration then
|
if not self:IsVisible() or not self.actionDuration then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.sentSpell ~= lineId then
|
self:UpdateLagBar()
|
||||||
self.spellCastSent = nil
|
self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
|
||||||
end
|
|
||||||
|
|
||||||
local scale
|
|
||||||
if self.unit == "vehicle" then
|
|
||||||
scale = 0
|
|
||||||
elseif self.useFixedLatency then
|
|
||||||
scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
|
|
||||||
else
|
|
||||||
local now = GetTime()
|
|
||||||
local lag = now - (self.spellCastSent or now)
|
|
||||||
scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
|
|
||||||
end
|
|
||||||
|
|
||||||
self:SetBarCoord(self.lagBar, scale, true, true)
|
|
||||||
|
|
||||||
self.spellCastSent = nil
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@ -461,20 +448,43 @@ function CastBar.prototype:SpellCastChannelStart(event, unit)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self:UpdateLagBar(self.moduleSettings.reverseChannel)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- OVERRIDE
|
||||||
|
function CastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
||||||
|
CastBar.super.prototype.SpellCastSucceeded(self, event, unit, castGuid, spellId)
|
||||||
|
|
||||||
|
if not self.actionDuration or unit ~= self.unit then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
self:UpdateLagBar()
|
||||||
|
self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function CastBar.prototype:UpdateLagBar(isChannel)
|
||||||
|
local now = GetTime()
|
||||||
|
if self.nextLagUpdate and now <= self.nextLagUpdate then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local scale
|
local scale
|
||||||
if self.unit == "vehicle" then
|
if self.unit == "vehicle" then
|
||||||
scale = 0
|
scale = 0
|
||||||
elseif self.useFixedLatency then
|
elseif self.useFixedLatency then
|
||||||
scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
|
scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
|
||||||
else
|
else
|
||||||
local now = GetTime()
|
|
||||||
local lag = now - (self.spellCastSent or now)
|
local lag = now - (self.spellCastSent or now)
|
||||||
scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
|
if lag >= self.actionDuration then
|
||||||
|
scale = 0
|
||||||
|
else
|
||||||
|
scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local top = not self.moduleSettings.reverseChannel
|
self:SetBarCoord(self.lagBar, scale, not isChannel, true)
|
||||||
|
|
||||||
self:SetBarCoord(self.lagBar, scale, top, true)
|
|
||||||
|
|
||||||
self.spellCastSent = nil
|
self.spellCastSent = nil
|
||||||
end
|
end
|
||||||
|
@ -18,7 +18,7 @@ IceClassPowerCounter.prototype.requiredSpec = nil
|
|||||||
IceClassPowerCounter.prototype.shouldShowUnmodified = false
|
IceClassPowerCounter.prototype.shouldShowUnmodified = false
|
||||||
IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
|
IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
|
||||||
IceClassPowerCounter.prototype.unit = "player"
|
IceClassPowerCounter.prototype.unit = "player"
|
||||||
|
IceClassPowerCounter.prototype.round = ceil
|
||||||
IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 }
|
IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 }
|
||||||
IceClassPowerCounter.prototype.currentGrowMode = nil
|
IceClassPowerCounter.prototype.currentGrowMode = nil
|
||||||
|
|
||||||
@ -465,7 +465,7 @@ end
|
|||||||
function IceClassPowerCounter.prototype:DisplayCounter()
|
function IceClassPowerCounter.prototype:DisplayCounter()
|
||||||
self:UnregisterEvent("PLAYER_LEVEL_UP")
|
self:UnregisterEvent("PLAYER_LEVEL_UP")
|
||||||
|
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateRunePower")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateRunePower")
|
||||||
self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
|
self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
|
||||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateRunePower")
|
self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateRunePower")
|
||||||
|
|
||||||
@ -485,7 +485,7 @@ function IceClassPowerCounter.prototype:Disable(core)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||||
if event and (event == "UNIT_POWER" or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
|
if event and (event == IceHUD.UnitPowerEvent or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -501,13 +501,17 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
|||||||
local percentReady = self.shouldShowUnmodified and (UnitPower("player", self.unitPower, true) / self.unmodifiedMaxPerRune) or numReady
|
local percentReady = self.shouldShowUnmodified and (UnitPower("player", self.unitPower, true) / self.unmodifiedMaxPerRune) or numReady
|
||||||
|
|
||||||
if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
|
if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
|
||||||
self.frame.numeric:SetText(tostring(percentReady))
|
if self.numericFormat then
|
||||||
|
self.frame.numeric:SetText(format(self.numericFormat, percentReady))
|
||||||
|
else
|
||||||
|
self.frame.numeric:SetText(tostring(percentReady))
|
||||||
|
end
|
||||||
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
||||||
end
|
end
|
||||||
|
|
||||||
if self:GetRuneMode() ~= "Numeric" then
|
if self:GetRuneMode() ~= "Numeric" then
|
||||||
for i=1, self.numRunes do
|
for i=1, self.numRunes do
|
||||||
if i <= ceil(percentReady) then
|
if i <= self.round(percentReady) then
|
||||||
if self:GetRuneMode() == "Graphical" then
|
if self:GetRuneMode() == "Graphical" then
|
||||||
self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
|
self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
|
||||||
else
|
else
|
||||||
|
@ -7,6 +7,11 @@ local AnticipationSpellId = 114015
|
|||||||
|
|
||||||
ComboPoints.prototype.comboSize = 20
|
ComboPoints.prototype.comboSize = 20
|
||||||
|
|
||||||
|
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function ComboPoints.prototype:init()
|
function ComboPoints.prototype:init()
|
||||||
ComboPoints.super.prototype.init(self, "ComboPoints")
|
ComboPoints.super.prototype.init(self, "ComboPoints")
|
||||||
@ -252,8 +257,10 @@ function ComboPoints.prototype:Enable(core)
|
|||||||
if IceHUD.WowVer < 70000 then
|
if IceHUD.WowVer < 70000 then
|
||||||
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
||||||
else
|
else
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
||||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
||||||
@ -436,7 +443,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function ComboPoints.prototype:UpdateComboPoints(...)
|
function ComboPoints.prototype:UpdateComboPoints(...)
|
||||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -454,7 +461,11 @@ function ComboPoints.prototype:UpdateComboPoints(...)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if IceHUD.WowVer < 70000 then
|
if IceHUD.WowVer < 70000 then
|
||||||
_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
if IceHUD.WowVer < 80000 then
|
||||||
|
_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||||
|
else
|
||||||
|
_, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||||
|
end
|
||||||
else
|
else
|
||||||
anticipate = 0
|
anticipate = 0
|
||||||
end
|
end
|
||||||
@ -520,7 +531,12 @@ do
|
|||||||
|
|
||||||
function ComboPoints.prototype:CheckAnticipation(e, unit) -- UNIT_AURA handler
|
function ComboPoints.prototype:CheckAnticipation(e, unit) -- UNIT_AURA handler
|
||||||
if UnitIsUnit(unit, "player") then
|
if UnitIsUnit(unit, "player") then
|
||||||
local _, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
local _, _, _, newAntStacks
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
_, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||||
|
else
|
||||||
|
_, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||||
|
end
|
||||||
if newAntStacks ~= antStacks then
|
if newAntStacks ~= antStacks then
|
||||||
antStacks = newAntStacks
|
antStacks = newAntStacks
|
||||||
self:UpdateComboPoints()
|
self:UpdateComboPoints()
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
local ComboPointsBar = IceCore_CreateClass(IceBarElement)
|
local ComboPointsBar = IceCore_CreateClass(IceBarElement)
|
||||||
|
|
||||||
|
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||||
|
end
|
||||||
|
|
||||||
function ComboPointsBar.prototype:init()
|
function ComboPointsBar.prototype:init()
|
||||||
ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
|
ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
|
||||||
|
|
||||||
@ -69,7 +74,7 @@ function ComboPointsBar.prototype:Enable(core)
|
|||||||
if IceHUD.WowVer < 70000 then
|
if IceHUD.WowVer < 70000 then
|
||||||
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
||||||
else
|
else
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
|
||||||
end
|
end
|
||||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
||||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
||||||
@ -87,7 +92,7 @@ end
|
|||||||
local color = {}
|
local color = {}
|
||||||
|
|
||||||
function ComboPointsBar.prototype:UpdateComboPoints(...)
|
function ComboPointsBar.prototype:UpdateComboPoints(...)
|
||||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -36,7 +36,9 @@ function IceCustomBar.prototype:Enable(core)
|
|||||||
|
|
||||||
self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
|
self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
|
||||||
self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
|
self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
|
||||||
self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
|
||||||
|
end
|
||||||
self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
|
self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
|
||||||
if self.unitClass == "SHAMAN" then
|
if self.unitClass == "SHAMAN" then
|
||||||
self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotems")
|
self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotems")
|
||||||
@ -664,7 +666,12 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
|
|||||||
local remaining
|
local remaining
|
||||||
local isBuff = self.moduleSettings.buffOrDebuff == "buff" and true or false
|
local isBuff = self.moduleSettings.buffOrDebuff == "buff" and true or false
|
||||||
local buffFilter = (isBuff and "HELPFUL" or "HARMFUL") .. (self.moduleSettings.trackOnlyMine and "|PLAYER" or "")
|
local buffFilter = (isBuff and "HELPFUL" or "HARMFUL") .. (self.moduleSettings.trackOnlyMine and "|PLAYER" or "")
|
||||||
local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||||
|
else
|
||||||
|
buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||||
|
end
|
||||||
local isMine = unitCaster == "player"
|
local isMine = unitCaster == "player"
|
||||||
local mySpellId = tonumber(self.moduleSettings.buffToTrack)
|
local mySpellId = tonumber(self.moduleSettings.buffToTrack)
|
||||||
local checkId = mySpellId ~= nil
|
local checkId = mySpellId ~= nil
|
||||||
@ -690,7 +697,11 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
|
|||||||
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
|
|
||||||
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
if IceHUD.WowVer < 80000 then
|
||||||
|
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||||
|
else
|
||||||
|
buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||||
|
end
|
||||||
isMine = unitCaster == "player"
|
isMine = unitCaster == "player"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -21,11 +21,6 @@ IceCustomCDBar.prototype.cooldownDuration = 0
|
|||||||
IceCustomCDBar.prototype.cooldownEndTime = 0
|
IceCustomCDBar.prototype.cooldownEndTime = 0
|
||||||
IceCustomCDBar.prototype.coolingDown = false
|
IceCustomCDBar.prototype.coolingDown = false
|
||||||
|
|
||||||
-- super temp...remove this when blizzard fixes these spells to work by name with GetSpellCooldown()
|
|
||||||
local brokenSpellsNameToId = {}
|
|
||||||
table.insert(brokenSpellsNameToId, {"Holy Word: Serenity",88684})
|
|
||||||
table.insert(brokenSpellsNameToId, {"Holy Word: Sanctuary",88685})
|
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function IceCustomCDBar.prototype:init()
|
function IceCustomCDBar.prototype:init()
|
||||||
IceCustomCDBar.super.prototype.init(self, "MyCustomCDBar")
|
IceCustomCDBar.super.prototype.init(self, "MyCustomCDBar")
|
||||||
@ -821,14 +816,6 @@ function IceCustomCDBar.prototype:IsReady()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceCustomCDBar.prototype:GetSpellNameOrId(spellName)
|
function IceCustomCDBar.prototype:GetSpellNameOrId(spellName)
|
||||||
-- super temp hax. certain spells (the new 'morphing' spells) do not work by name with GetSpellCooldown(), only id.
|
|
||||||
for i=1,#brokenSpellsNameToId do
|
|
||||||
if spellName == brokenSpellsNameToId[i][1] then
|
|
||||||
spellName = brokenSpellsNameToId[i][2]
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return spellName
|
return spellName
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -245,6 +245,23 @@ function IceCustomCount.prototype:GetOptions()
|
|||||||
order = 34
|
order = 34
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opts["showWhenZero"] = {
|
||||||
|
type = 'toggle',
|
||||||
|
name = L["Show when zero"],
|
||||||
|
desc = L["Whether or not to show the counter when the value is zero. This will cause a 0 to be displayed at all times for Numeric mode and faded markers for graphical mode."],
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.showWhenZero
|
||||||
|
end,
|
||||||
|
set = function(info, v)
|
||||||
|
self.moduleSettings.showWhenZero = v
|
||||||
|
self:Redraw()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
order = 35,
|
||||||
|
}
|
||||||
|
|
||||||
return opts
|
return opts
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -426,7 +443,7 @@ function IceCustomCount.prototype:GetGradientColor(curr)
|
|||||||
local r, g, b = self:GetCustomColor()
|
local r, g, b = self:GetCustomColor()
|
||||||
local mr, mg, mb = self:GetCustomMinColor()
|
local mr, mg, mb = self:GetCustomMinColor()
|
||||||
local scale = max > 1 and ((curr-1)/(max-1)) or 1
|
local scale = max > 1 and ((curr-1)/(max-1)) or 1
|
||||||
if self.moduleSettings.countMode == "Numeric" then
|
if self.moduleSettings.countMode == "Numeric" and self.moduleSettings.showWhenZero then
|
||||||
scale = max > 1 and (curr/max) or 1
|
scale = max > 1 and (curr/max) or 1
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -443,7 +460,10 @@ function IceCustomCount.prototype:UpdateCustomCount()
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local points = IceStackCounter_GetCount(self) or 0
|
local points = IceStackCounter_GetCount(self)
|
||||||
|
if not points and self.moduleSettings.showWhenZero then
|
||||||
|
points = 0
|
||||||
|
end
|
||||||
local max = IceStackCounter_GetMaxCount(self)
|
local max = IceStackCounter_GetMaxCount(self)
|
||||||
|
|
||||||
if max > #self.frame.graphical then
|
if max > #self.frame.graphical then
|
||||||
|
@ -1,6 +1,14 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
local FocusMana = IceCore_CreateClass(IceUnitBar)
|
local FocusMana = IceCore_CreateClass(IceUnitBar)
|
||||||
|
|
||||||
|
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||||
|
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||||
|
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||||
|
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||||
|
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function FocusMana.prototype:init()
|
function FocusMana.prototype:init()
|
||||||
@ -32,8 +40,10 @@ function FocusMana.prototype:Enable(core)
|
|||||||
FocusMana.super.prototype.Enable(self, core)
|
FocusMana.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
if IceHUD.WowVer >= 40000 then
|
if IceHUD.WowVer >= 40000 then
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||||
|
end
|
||||||
else
|
else
|
||||||
self:RegisterEvent("UNIT_MANA", "UpdateEvent")
|
self:RegisterEvent("UNIT_MANA", "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||||
|
@ -20,7 +20,7 @@ function GlobalCoolDown.prototype:Enable(core)
|
|||||||
self.moduleSettings.inverse = "NORMAL"
|
self.moduleSettings.inverse = "NORMAL"
|
||||||
end
|
end
|
||||||
|
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_SENT","SpellCastSent")
|
self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
|
||||||
|
|
||||||
--self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
|
--self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_START","CooldownStateChanged")
|
self:RegisterEvent("UNIT_SPELLCAST_START","CooldownStateChanged")
|
||||||
@ -45,7 +45,10 @@ end
|
|||||||
|
|
||||||
function GlobalCoolDown.prototype:CVarUpdate()
|
function GlobalCoolDown.prototype:CVarUpdate()
|
||||||
self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
|
self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
|
||||||
self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000.0
|
local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
|
||||||
|
if recoveryOffset ~= nil then
|
||||||
|
self.fixedLatency = tonumber(recoveryOffset) / 1000.0
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- OVERRIDE
|
-- OVERRIDE
|
||||||
@ -140,20 +143,16 @@ function GlobalCoolDown.prototype:IsFull(scale)
|
|||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
function GlobalCoolDown.prototype:SpellCastSent(event, unit, spell)
|
function GlobalCoolDown.prototype:SpellCastChanged(event, cancelled)
|
||||||
if unit ~= "player" or not spell then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
self.spellCastSent = GetTime()
|
self.spellCastSent = GetTime()
|
||||||
end
|
end
|
||||||
|
|
||||||
function GlobalCoolDown.prototype:SpellCastStop(event, unit, spell, _, _, spellId)
|
function GlobalCoolDown.prototype:SpellCastStop(event, unit, castGuid, spellId)
|
||||||
if unit ~= "player" or not spellId or not self.CurrSpellId or self.CurrSpellId ~= spellId then
|
if unit ~= "player" or not spellId or not self.CurrSpellGuid or self.CurrSpellGuid ~= castGuid then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
self.CurrSpellId = nil
|
self.CurrSpellGuid = nil
|
||||||
|
|
||||||
if event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED" then
|
if event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED" then
|
||||||
self.CurrLerpTime = self.moduleSettings.desiredLerpTime
|
self.CurrLerpTime = self.moduleSettings.desiredLerpTime
|
||||||
@ -179,19 +178,19 @@ function GlobalCoolDown.prototype:GetSpellCastTime(spell)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell, _, _, spellId)
|
function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, castGuid, spellId)
|
||||||
if unit ~= "player" or not spellId then
|
if unit ~= "player" or not spellId then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Ignore all events unrelated to the spell currently being cast
|
-- Ignore all events unrelated to the spell currently being cast
|
||||||
if self.CurrSpellId and self.CurrSpellId ~= spellId then
|
if self.CurrSpellGuid and self.CurrSpellGuid ~= castGuid then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Update the current spell ID for all events indicating a spellcast is starting
|
-- Update the current spell ID for all events indicating a spellcast is starting
|
||||||
if event ~= "UNIT_SPELLCAST_SUCCEEDED" then
|
if event ~= "UNIT_SPELLCAST_SUCCEEDED" then
|
||||||
self.CurrSpellId = spellId
|
self.CurrSpellGuid = castGuid
|
||||||
end
|
end
|
||||||
|
|
||||||
local start, dur = GetSpellCooldown(self.CDSpellId)
|
local start, dur = GetSpellCooldown(self.CDSpellId)
|
||||||
|
@ -1,10 +1,15 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
local HarmonyPower = IceCore_CreateClass(IceClassPowerCounter)
|
local HarmonyPower = IceCore_CreateClass(IceClassPowerCounter)
|
||||||
|
|
||||||
function HarmonyPower.prototype:init()
|
local SPELL_POWER_CHI = SPELL_POWER_CHI
|
||||||
HarmonyPower.super.prototype.init(self, "HarmonyPower")
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_CHI = Enum.PowerType.Chi
|
||||||
|
end
|
||||||
|
|
||||||
self:SetDefaultColor("HarmonyPowerNumeric", 218, 231, 31)
|
function HarmonyPower.prototype:init()
|
||||||
|
HarmonyPower.super.prototype.init(self, "Chi")
|
||||||
|
|
||||||
|
self:SetDefaultColor("ChiNumeric", 218, 231, 31)
|
||||||
|
|
||||||
-- pulled from MonkHarmonyBar.xml in Blizzard's UI source
|
-- pulled from MonkHarmonyBar.xml in Blizzard's UI source
|
||||||
self.runeCoords =
|
self.runeCoords =
|
||||||
@ -17,7 +22,7 @@ function HarmonyPower.prototype:init()
|
|||||||
{0.00390625, 0.08593750, 0.71093750, 0.87500000},
|
{0.00390625, 0.08593750, 0.71093750, 0.87500000},
|
||||||
}
|
}
|
||||||
self.numRunes = 4
|
self.numRunes = 4
|
||||||
self.numericColor = "HarmonyPowerNumeric"
|
self.numericColor = "ChiNumeric"
|
||||||
if IceHUD.WowVer >= 50100 then
|
if IceHUD.WowVer >= 50100 then
|
||||||
self.unitPower = SPELL_POWER_CHI
|
self.unitPower = SPELL_POWER_CHI
|
||||||
else
|
else
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
local HolyPower = IceCore_CreateClass(IceClassPowerCounter)
|
local HolyPower = IceCore_CreateClass(IceClassPowerCounter)
|
||||||
|
|
||||||
|
local SPELL_POWER_HOLY_POWER = SPELL_POWER_HOLY_POWER
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_HOLY_POWER = Enum.PowerType.HolyPower
|
||||||
|
end
|
||||||
|
|
||||||
function HolyPower.prototype:init()
|
function HolyPower.prototype:init()
|
||||||
HolyPower.super.prototype.init(self, "HolyPower")
|
HolyPower.super.prototype.init(self, "HolyPower")
|
||||||
|
|
||||||
|
@ -42,8 +42,10 @@ function PetHealth.prototype:Enable(core)
|
|||||||
PetHealth.super.prototype.Enable(self, core)
|
PetHealth.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
self:RegisterEvent("PET_UI_UPDATE", "CheckPet");
|
self:RegisterEvent("PET_UI_UPDATE", "CheckPet");
|
||||||
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
|
if IceHUD.WowVer < 80000 then
|
||||||
self:RegisterEvent("PET_BAR_CHANGED", "CheckPet");
|
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
|
||||||
|
end
|
||||||
|
self:RegisterEvent(IceHUD.WowVer < 80000 and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet");
|
||||||
self:RegisterEvent("UNIT_PET", "CheckPet");
|
self:RegisterEvent("UNIT_PET", "CheckPet");
|
||||||
|
|
||||||
self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
|
self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
|
||||||
|
@ -1,6 +1,17 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
local PetMana = IceCore_CreateClass(IceUnitBar)
|
local PetMana = IceCore_CreateClass(IceUnitBar)
|
||||||
|
|
||||||
|
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||||
|
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||||
|
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||||
|
local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||||
|
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||||
|
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||||
|
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function PetMana.prototype:init()
|
function PetMana.prototype:init()
|
||||||
PetMana.super.prototype.init(self, "PetMana", "pet")
|
PetMana.super.prototype.init(self, "PetMana", "pet")
|
||||||
@ -51,13 +62,17 @@ function PetMana.prototype:Enable(core)
|
|||||||
PetMana.super.prototype.Enable(self, core)
|
PetMana.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
self:RegisterEvent("PET_UI_UPDATE", "CheckPet")
|
self:RegisterEvent("PET_UI_UPDATE", "CheckPet")
|
||||||
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
|
if IceHUD.WowVer < 80000 then
|
||||||
self:RegisterEvent("PET_BAR_CHANGED", "CheckPet")
|
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
|
||||||
|
end
|
||||||
|
self:RegisterEvent(IceHUD.WowVer < 80000 and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet")
|
||||||
self:RegisterEvent("UNIT_PET", "CheckPet")
|
self:RegisterEvent("UNIT_PET", "CheckPet")
|
||||||
|
|
||||||
if IceHUD.WowVer >= 40000 then
|
if IceHUD.WowVer >= 40000 then
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||||
|
end
|
||||||
else
|
else
|
||||||
self:RegisterEvent("UNIT_MANA", "UpdateEvent")
|
self:RegisterEvent("UNIT_MANA", "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||||
|
@ -6,6 +6,13 @@ PlayerAltMana.prototype.PlayerAltManaMax = nil
|
|||||||
|
|
||||||
local _, unitClass = UnitClass("player")
|
local _, unitClass = UnitClass("player")
|
||||||
|
|
||||||
|
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||||
|
local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||||
|
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function PlayerAltMana.prototype:init()
|
function PlayerAltMana.prototype:init()
|
||||||
PlayerAltMana.super.prototype.init(self, "PlayerAltMana", "player")
|
PlayerAltMana.super.prototype.init(self, "PlayerAltMana", "player")
|
||||||
@ -76,6 +83,7 @@ function PlayerAltMana.prototype:Update()
|
|||||||
|
|
||||||
self.PlayerAltMana = UnitPower(self.unit, SPELL_POWER_MANA)
|
self.PlayerAltMana = UnitPower(self.unit, SPELL_POWER_MANA)
|
||||||
self.PlayerAltManaMax = UnitPowerMax(self.unit, SPELL_POWER_MANA)
|
self.PlayerAltManaMax = UnitPowerMax(self.unit, SPELL_POWER_MANA)
|
||||||
|
self.PlayerAltManaPercentage = self.PlayerAltManaMax ~= 0 and (self.PlayerAltMana/self.PlayerAltManaMax) or 0
|
||||||
|
|
||||||
if (not self.alive or not ShouldShow(self.unit) or not self.PlayerAltMana or not self.PlayerAltManaMax or self.PlayerAltManaMax == 0) then
|
if (not self.alive or not ShouldShow(self.unit) or not self.PlayerAltMana or not self.PlayerAltManaMax or self.PlayerAltManaMax == 0) then
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
@ -84,6 +92,16 @@ function PlayerAltMana.prototype:Update()
|
|||||||
self:Show(true)
|
self:Show(true)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||||
|
self:SetBottomText1(math.floor(self.PlayerAltManaPercentage * 100))
|
||||||
|
|
||||||
|
if (self.PlayerAltManaMax ~= 100) then
|
||||||
|
self:SetBottomText2(self:GetFormattedText(self:Round(self.PlayerAltMana), self:Round(self.PlayerAltManaMax)), "PlayerMana")
|
||||||
|
else
|
||||||
|
self:SetBottomText2()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
self:UpdateBar(self.PlayerAltManaMax ~= 0 and self.PlayerAltMana / self.PlayerAltManaMax or 0, "PlayerAltMana")
|
self:UpdateBar(self.PlayerAltManaMax ~= 0 and self.PlayerAltMana / self.PlayerAltManaMax or 0, "PlayerAltMana")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -28,8 +28,10 @@ end
|
|||||||
function IceHUDPlayerAlternatePower.prototype:Enable(core)
|
function IceHUDPlayerAlternatePower.prototype:Enable(core)
|
||||||
IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
|
IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||||
|
end
|
||||||
self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
|
self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
|
||||||
self:RegisterEvent("UNIT_POWER_BAR_HIDE", "PowerBarHide")
|
self:RegisterEvent("UNIT_POWER_BAR_HIDE", "PowerBarHide")
|
||||||
|
|
||||||
|
@ -1078,9 +1078,9 @@ function PlayerHealth.prototype:CheckPartyRole()
|
|||||||
if configMode or IceHUD:GetIsInLFGGroup() then
|
if configMode or IceHUD:GetIsInLFGGroup() then
|
||||||
if (configMode or self.moduleSettings.showPartyRoleIcon) and not self.frame.PartyRoleIcon then
|
if (configMode or self.moduleSettings.showPartyRoleIcon) and not self.frame.PartyRoleIcon then
|
||||||
local isTank, isHeal, isDPS
|
local isTank, isHeal, isDPS
|
||||||
local proposalExists, typeID, id, name
|
local proposalExists, typeID, id, subtypeID, name
|
||||||
local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
|
local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
|
||||||
proposalExists, typeID, id, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||||
|
|
||||||
local p = self.unit
|
local p = self.unit
|
||||||
if IceHUD.WowVer < 40000 then
|
if IceHUD.WowVer < 40000 then
|
||||||
@ -1096,7 +1096,7 @@ function PlayerHealth.prototype:CheckPartyRole()
|
|||||||
IceHUD:Debug( tostring(proposalExists) .."**".. tostring(typeID) .."**".. tostring(id) .."**".. tostring(name) .."**".. tostring(texture) .."**".. tostring(role) .."**".. tostring(hasResponded) .."**".. tostring(totalEncounters) .."**".. tostring(completedEncounters) .."**".. tostring(numMembers) .."**".. tostring(isleader) )
|
IceHUD:Debug( tostring(proposalExists) .."**".. tostring(typeID) .."**".. tostring(id) .."**".. tostring(name) .."**".. tostring(texture) .."**".. tostring(role) .."**".. tostring(hasResponded) .."**".. tostring(totalEncounters) .."**".. tostring(completedEncounters) .."**".. tostring(numMembers) .."**".. tostring(isleader) )
|
||||||
|
|
||||||
if proposalExists == true then
|
if proposalExists == true then
|
||||||
IceHUD:Debug(tostring(typeID).." "..role)
|
IceHUD:Debug(tostring(typeID).." "..(role or ""))
|
||||||
isTank = (role == "TANK")
|
isTank = (role == "TANK")
|
||||||
isHeal = (role == "HEALER")
|
isHeal = (role == "HEALER")
|
||||||
isDPS = (role == "DAMAGER")
|
isDPS = (role == "DAMAGER")
|
||||||
|
@ -3,6 +3,29 @@ local PlayerMana = IceCore_CreateClass(IceUnitBar)
|
|||||||
|
|
||||||
local IceHUD = _G.IceHUD
|
local IceHUD = _G.IceHUD
|
||||||
|
|
||||||
|
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||||
|
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||||
|
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||||
|
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||||
|
local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
|
||||||
|
local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
|
||||||
|
local SPELL_POWER_FURY = SPELL_POWER_FURY
|
||||||
|
local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
|
||||||
|
local SPELL_POWER_PAIN = SPELL_POWER_PAIN
|
||||||
|
local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||||
|
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||||
|
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||||
|
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||||
|
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
|
||||||
|
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||||
|
SPELL_POWER_FURY = Enum.PowerType.Fury
|
||||||
|
SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
|
||||||
|
SPELL_POWER_PAIN = Enum.PowerType.Pain
|
||||||
|
SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
|
||||||
|
end
|
||||||
|
|
||||||
PlayerMana.prototype.manaType = nil
|
PlayerMana.prototype.manaType = nil
|
||||||
PlayerMana.prototype.tickStart = nil
|
PlayerMana.prototype.tickStart = nil
|
||||||
PlayerMana.prototype.previousEnergy = nil
|
PlayerMana.prototype.previousEnergy = nil
|
||||||
@ -18,9 +41,9 @@ function PlayerMana.prototype:init()
|
|||||||
self:SetDefaultColor("PlayerRunicPower", 62, 54, 152)
|
self:SetDefaultColor("PlayerRunicPower", 62, 54, 152)
|
||||||
if IceHUD.WowVer >= 70000 then
|
if IceHUD.WowVer >= 70000 then
|
||||||
self:SetDefaultColor("PlayerInsanity", 150, 50, 255)
|
self:SetDefaultColor("PlayerInsanity", 150, 50, 255)
|
||||||
self:SetDefaultColor("PlayerFury", 255, 50, 255)
|
self:SetDefaultColor("PlayerFury", 201, 66, 253)
|
||||||
self:SetDefaultColor("PlayerMaelstrom", 62, 54, 152)
|
self:SetDefaultColor("PlayerMaelstrom", 62, 54, 152)
|
||||||
self:SetDefaultColor("PlayerPain", 255, 50, 255)
|
self:SetDefaultColor("PlayerPain", 255, 156, 0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -131,8 +154,10 @@ function PlayerMana.prototype:Enable(core)
|
|||||||
self:CreateTickerFrame()
|
self:CreateTickerFrame()
|
||||||
|
|
||||||
if IceHUD.WowVer >= 40000 then
|
if IceHUD.WowVer >= 40000 then
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||||
|
end
|
||||||
else
|
else
|
||||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
|
self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
|
||||||
@ -271,6 +296,14 @@ function PlayerMana.prototype:TreatEmptyAsFull()
|
|||||||
or self.manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_PAIN 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
|
end
|
||||||
|
|
||||||
|
function PlayerMana.prototype:IsFull(scale)
|
||||||
|
if IceHUD.WowVer >= 80000 and self.manaType == SPELL_POWER_LUNAR_POWER and IsPlayerSpell(202430) then
|
||||||
|
return scale - 0.5 >= 0
|
||||||
|
end
|
||||||
|
|
||||||
|
return PlayerMana.super.prototype.IsFull(self, scale)
|
||||||
|
end
|
||||||
|
|
||||||
function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
|
function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
|
||||||
self:Update(unit, powertype)
|
self:Update(unit, powertype)
|
||||||
end
|
end
|
||||||
|
@ -56,7 +56,7 @@ do
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
self.current = select(15, UnitAura(self.unit, spellName)) or 0
|
self.current = select(IceHUD.WowVer < 80000 and 15 or 14, UnitAura(self.unit, spellName)) or 0
|
||||||
|
|
||||||
self:Update()
|
self:Update()
|
||||||
end
|
end
|
||||||
|
@ -19,6 +19,11 @@ for _, v in ipairs(RtBBuffs) do
|
|||||||
RtBSet[v] = true
|
RtBSet[v] = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function RollTheBones.prototype:init()
|
function RollTheBones.prototype:init()
|
||||||
RollTheBones.super.prototype.init(self, "RollTheBones", "player")
|
RollTheBones.super.prototype.init(self, "RollTheBones", "player")
|
||||||
@ -30,6 +35,8 @@ function RollTheBones.prototype:init()
|
|||||||
self:SetDefaultColor("RollTheBones", 1, 0.6, 0.2)
|
self:SetDefaultColor("RollTheBones", 1, 0.6, 0.2)
|
||||||
self:SetDefaultColor("RollTheBones2", 0.75, 1, 0.2)
|
self:SetDefaultColor("RollTheBones2", 0.75, 1, 0.2)
|
||||||
self:SetDefaultColor("RollTheBones3", 0.4, 1, 0.2)
|
self:SetDefaultColor("RollTheBones3", 0.4, 1, 0.2)
|
||||||
|
self:SetDefaultColor("RollTheBones4", 0.4, 1, 0.2)
|
||||||
|
self:SetDefaultColor("RollTheBones5", 0.1, 1, 0.7)
|
||||||
self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
|
self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
|
||||||
self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
|
self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
|
||||||
|
|
||||||
@ -43,7 +50,7 @@ function RollTheBones.prototype:Enable(core)
|
|||||||
RollTheBones.super.prototype.Enable(self, core)
|
RollTheBones.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
self:RegisterEvent("UNIT_AURA", "UpdateRollTheBones")
|
self:RegisterEvent("UNIT_AURA", "UpdateRollTheBones")
|
||||||
self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
|
||||||
|
|
||||||
if not self.moduleSettings.alwaysFullAlpha then
|
if not self.moduleSettings.alwaysFullAlpha then
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
@ -59,7 +66,7 @@ function RollTheBones.prototype:Disable(core)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function RollTheBones.prototype:ComboPointsChanged(...)
|
function RollTheBones.prototype:ComboPointsChanged(...)
|
||||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -212,8 +219,12 @@ end
|
|||||||
|
|
||||||
function RollTheBones.prototype:GetBuffDuration(unitName, ids)
|
function RollTheBones.prototype:GetBuffDuration(unitName, ids)
|
||||||
local i = 1
|
local i = 1
|
||||||
local buff, rank, texture, type, duration, endTime, remaining, spellId
|
local buff, _, type, duration, endTime, spellId
|
||||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
if IceHUD.WowVer < 80000 then
|
||||||
|
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||||
|
else
|
||||||
|
buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||||
|
end
|
||||||
|
|
||||||
local realDuration, remaining, count
|
local realDuration, remaining, count
|
||||||
local now = GetTime()
|
local now = GetTime()
|
||||||
@ -230,7 +241,11 @@ function RollTheBones.prototype:GetBuffDuration(unitName, ids)
|
|||||||
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
|
|
||||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
if IceHUD.WowVer < 80000 then
|
||||||
|
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||||
|
else
|
||||||
|
buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -8,17 +8,17 @@ if IceHUD.WowVer >= 70000 then
|
|||||||
CooldownFrame_SetTimer = CooldownFrame_Set
|
CooldownFrame_SetTimer = CooldownFrame_Set
|
||||||
end
|
end
|
||||||
|
|
||||||
-- blizzard cracks me up. the below block is copied verbatim from RuneFrame.lua ;)
|
|
||||||
--Readability == win
|
|
||||||
local RUNETYPE_BLOOD = 1;
|
local RUNETYPE_BLOOD = 1;
|
||||||
local RUNETYPE_DEATH = 2;
|
local RUNETYPE_DEATH = IceHUD.WowVer < 70300 and 2 or 3;
|
||||||
local RUNETYPE_FROST = 3;
|
local RUNETYPE_FROST = IceHUD.WowVer < 70300 and 3 or 2;
|
||||||
local RUNETYPE_CHROMATIC = 4;
|
local RUNETYPE_CHROMATIC = 4;
|
||||||
local RUNETYPE_LEGION = 5; -- not real, but makes for an easy update
|
local RUNETYPE_LEGION = 5; -- not real, but makes for an easy update
|
||||||
|
|
||||||
local GetRuneType = GetRuneType
|
local GetRuneType = GetRuneType
|
||||||
if IceHUD.WowVer >= 70000 then
|
if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 70300 then
|
||||||
GetRuneType = function() return RUNETYPE_LEGION end
|
GetRuneType = function() return RUNETYPE_LEGION end
|
||||||
|
elseif IceHUD.WowVer >= 70300 then
|
||||||
|
GetRuneType = function() return GetSpecialization() end
|
||||||
end
|
end
|
||||||
|
|
||||||
local RUNEMODE_DEFAULT = "Blizzard"
|
local RUNEMODE_DEFAULT = "Blizzard"
|
||||||
@ -43,15 +43,22 @@ Runes.prototype.numRunes = 6
|
|||||||
|
|
||||||
Runes.prototype.lastRuneState = {}
|
Runes.prototype.lastRuneState = {}
|
||||||
|
|
||||||
|
local SPELL_POWER_RUNES = SPELL_POWER_RUNES
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_RUNES = Enum.PowerType.Runes
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function Runes.prototype:init()
|
function Runes.prototype:init()
|
||||||
Runes.super.prototype.init(self, "Runes")
|
Runes.super.prototype.init(self, "Runes")
|
||||||
|
|
||||||
if IceHUD.WowVer < 70000 then
|
if IceHUD.WowVer < 70000 or IceHUD.WowVer >= 70300 then
|
||||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_BLOOD], 255, 0, 0)
|
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_BLOOD], 255, 0, 0)
|
||||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_DEATH], 0, 207, 0)
|
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_DEATH], 0, 207, 0)
|
||||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_FROST], 0, 255, 255)
|
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_FROST], 0, 255, 255)
|
||||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
|
if IceHUD.WowVer < 70300 then
|
||||||
|
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
|
||||||
|
end
|
||||||
else
|
else
|
||||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_LEGION], 204, 204, 255)
|
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_LEGION], 204, 204, 255)
|
||||||
end
|
end
|
||||||
@ -268,8 +275,13 @@ function Runes.prototype:Enable(core)
|
|||||||
|
|
||||||
Runes.super.prototype.Enable(self, core)
|
Runes.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
self:RegisterEvent("RUNE_POWER_UPDATE", "UpdateRunePower")
|
self:RegisterEvent("RUNE_POWER_UPDATE", "ResetRuneAvailability")
|
||||||
self:RegisterEvent("RUNE_TYPE_UPDATE", "UpdateRuneType")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("RUNE_TYPE_UPDATE", "UpdateRuneType")
|
||||||
|
end
|
||||||
|
if IceHUD.WowVer >= 70300 then
|
||||||
|
self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", "UpdateRuneColors")
|
||||||
|
end
|
||||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetRuneAvailability")
|
self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetRuneAvailability")
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
|
self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
|
||||||
|
|
||||||
@ -300,16 +312,17 @@ function Runes.prototype:CheckMaxNumRunes(event, unit, powerType)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function Runes.prototype:ResetRuneAvailability()
|
function Runes.prototype:ResetRuneAvailability(event)
|
||||||
for i=1, self.numRunes do
|
for i=1, self.numRunes do
|
||||||
self:UpdateRunePower(nil, i, true)
|
self:UpdateRunePower(event, i, not event)
|
||||||
end
|
end
|
||||||
|
|
||||||
self:Redraw()
|
self:Redraw()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- simply shows/hides the foreground rune when it becomes usable/unusable. this allows the background transparent rune to show only
|
-- simply shows/hides the foreground rune when it becomes usable/unusable. this allows the background transparent rune to show only
|
||||||
function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
||||||
if not rune or not self.frame.graphical or #self.frame.graphical < rune then
|
if rune and (not self.frame.graphical or #self.frame.graphical < rune) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -323,27 +336,9 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
|||||||
local lastState = self.lastRuneState[rune]
|
local lastState = self.lastRuneState[rune]
|
||||||
self.lastRuneState[rune] = usable
|
self.lastRuneState[rune] = usable
|
||||||
|
|
||||||
if self.moduleSettings.runeMode ~= RUNEMODE_DEFAULT then
|
-- if lastState == usable then
|
||||||
if lastState == usable then
|
-- return
|
||||||
return
|
-- end
|
||||||
end
|
|
||||||
|
|
||||||
if usable then
|
|
||||||
for i=1,self.numRunes do
|
|
||||||
if self.frame.graphical[i]:GetAlpha() == 0 then
|
|
||||||
rune = i
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
else
|
|
||||||
for i=1,self.numRunes do
|
|
||||||
if self.frame.graphical[i]:GetAlpha() == 0 then
|
|
||||||
break
|
|
||||||
end
|
|
||||||
rune = i
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- print("Runes.prototype:UpdateRunePower: rune="..rune.." usable="..(usable and "yes" or "no").." GetRuneType(rune)="..GetRuneType(rune));
|
-- print("Runes.prototype:UpdateRunePower: rune="..rune.." usable="..(usable and "yes" or "no").." GetRuneType(rune)="..GetRuneType(rune));
|
||||||
|
|
||||||
@ -357,12 +352,13 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
|||||||
self.frame.graphical[rune]:SetAlpha(1)
|
self.frame.graphical[rune]:SetAlpha(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not dontFlash then
|
if not dontFlash and lastState ~= usable then
|
||||||
local fadeInfo={
|
local fadeInfo={
|
||||||
mode = "IN",
|
mode = "IN",
|
||||||
timeToFade = 0.5,
|
timeToFade = 0.25,
|
||||||
finishedFunc = function(rune) self:ShineFinished(rune) end,
|
finishedFunc = Runes.prototype.ShineFinished,
|
||||||
finishedArg1 = rune
|
finishedArg1 = self,
|
||||||
|
finishedArg2 = rune
|
||||||
}
|
}
|
||||||
UIFrameFade(self.frame.graphical[rune].shine, fadeInfo);
|
UIFrameFade(self.frame.graphical[rune].shine, fadeInfo);
|
||||||
end
|
end
|
||||||
@ -380,8 +376,6 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
|||||||
self.frame.graphical[rune]:SetAlpha(0.2)
|
self.frame.graphical[rune]:SetAlpha(0.2)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self:Redraw()
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function Runes.prototype:GetNumRunesAvailable()
|
function Runes.prototype:GetNumRunesAvailable()
|
||||||
@ -418,7 +412,17 @@ function Runes.prototype:UpdateRuneType(event, rune)
|
|||||||
self.frame.graphical[rune].rune:SetVertexColor(self:GetColor("Runes"..thisRuneName))
|
self.frame.graphical[rune].rune:SetVertexColor(self:GetColor("Runes"..thisRuneName))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function Runes.prototype:UpdateRuneColors()
|
||||||
|
for i=1,self.numRunes do
|
||||||
|
self:UpdateRuneType(nil, i)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function Runes.prototype:GetRuneTexture(runeName)
|
function Runes.prototype:GetRuneTexture(runeName)
|
||||||
|
if IceHUD.WowVer >= 70300 then
|
||||||
|
runeName = self.runeNames[RUNETYPE_LEGION]
|
||||||
|
end
|
||||||
|
|
||||||
if self.moduleSettings.runeMode == RUNEMODE_DEFAULT and runeName then
|
if self.moduleSettings.runeMode == RUNEMODE_DEFAULT and runeName then
|
||||||
return "Interface\\PlayerFrame\\UI-PlayerFrame-DeathKnight-"..runeName
|
return "Interface\\PlayerFrame\\UI-PlayerFrame-DeathKnight-"..runeName
|
||||||
elseif self.moduleSettings.runeMode == RUNEMODE_BAR then
|
elseif self.moduleSettings.runeMode == RUNEMODE_BAR then
|
||||||
@ -555,13 +559,7 @@ function Runes.prototype:ShowBlizz()
|
|||||||
RuneFrame:Show()
|
RuneFrame:Show()
|
||||||
|
|
||||||
RuneFrame:GetScript("OnLoad")(RuneFrame)
|
RuneFrame:GetScript("OnLoad")(RuneFrame)
|
||||||
RuneFrame:GetScript("OnEvent")(frame, "PLAYER_ENTERING_WORLD")
|
RuneFrame:GetScript("OnEvent")(RuneFrame, "PLAYER_ENTERING_WORLD")
|
||||||
for i=1, self.numRunes do
|
|
||||||
local frame = _G["RuneButtonIndividual"..i]
|
|
||||||
if frame then
|
|
||||||
frame:GetScript("OnLoad")(frame)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function hook_playerframe()
|
local function hook_playerframe()
|
||||||
|
@ -3,14 +3,26 @@ local ShardCounter = IceCore_CreateClass(IceClassPowerCounter)
|
|||||||
|
|
||||||
local CurrentSpec = nil
|
local CurrentSpec = nil
|
||||||
|
|
||||||
local AfflictionCoords =
|
local AfflictionCoords
|
||||||
{
|
if IceHUD.WowVer < 70200 then
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
AfflictionCoords =
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
}
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
|
}
|
||||||
|
else
|
||||||
|
AfflictionCoords =
|
||||||
|
{
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
local DestructionCoords =
|
local DestructionCoords =
|
||||||
{
|
{
|
||||||
@ -25,6 +37,11 @@ local DemonologyCoords =
|
|||||||
{0.03906250, 0.55468750, 0.10546875, 0.19921875},
|
{0.03906250, 0.55468750, 0.10546875, 0.19921875},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local SPELL_POWER_SOUL_SHARDS = SPELL_POWER_SOUL_SHARDS
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards
|
||||||
|
end
|
||||||
|
|
||||||
function ShardCounter.prototype:init()
|
function ShardCounter.prototype:init()
|
||||||
ShardCounter.super.prototype.init(self, "Warlock Power")
|
ShardCounter.super.prototype.init(self, "Warlock Power")
|
||||||
|
|
||||||
@ -36,6 +53,10 @@ function ShardCounter.prototype:init()
|
|||||||
if IceHUD.WowVer >= 70000 then
|
if IceHUD.WowVer >= 70000 then
|
||||||
self.runeHeight = 23
|
self.runeHeight = 23
|
||||||
self.runeWidth = 26
|
self.runeWidth = 26
|
||||||
|
if IceHUD.WowVer >= 70200 then
|
||||||
|
self.runeHeight = 27
|
||||||
|
self.runeWidth = 22
|
||||||
|
end
|
||||||
self.runeCoords = AfflictionCoords
|
self.runeCoords = AfflictionCoords
|
||||||
self.unitPower = SPELL_POWER_SOUL_SHARDS
|
self.unitPower = SPELL_POWER_SOUL_SHARDS
|
||||||
self.unit = "player"
|
self.unit = "player"
|
||||||
@ -45,6 +66,16 @@ end
|
|||||||
function ShardCounter.prototype:Enable(core)
|
function ShardCounter.prototype:Enable(core)
|
||||||
if IceHUD.WowVer >= 70000 then
|
if IceHUD.WowVer >= 70000 then
|
||||||
self.numRunes = UnitPowerMax(self.unit, self.unitPower)
|
self.numRunes = UnitPowerMax(self.unit, self.unitPower)
|
||||||
|
|
||||||
|
if GetSpecialization() == SPEC_WARLOCK_DESTRUCTION then
|
||||||
|
self.shouldShowUnmodified = true
|
||||||
|
self.numericFormat = "%.1f"
|
||||||
|
self.round = floor
|
||||||
|
else
|
||||||
|
self.shouldShowUnmodified = nil
|
||||||
|
self.numericFormat = nil
|
||||||
|
self.round = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
ShardCounter.super.prototype.Enable(self, core)
|
ShardCounter.super.prototype.Enable(self, core)
|
||||||
@ -90,10 +121,10 @@ function ShardCounter.prototype:CheckGreenFire()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function ShardCounter.prototype:UpdatePowerType(event)
|
function ShardCounter.prototype:UpdatePowerType(event)
|
||||||
if IceHUD.WowVer >= 50000 then
|
if IceHUD.WowVer >= 50000 and IceHUD.WowVer < 80000 then
|
||||||
CurrentSpec = GetSpecialization()
|
CurrentSpec = GetSpecialization()
|
||||||
else
|
else
|
||||||
-- all warlocks use shards in pre-5.0, so just act like our spec is affliction
|
-- all warlocks use shards in pre-5.0/post-8.0, so just act like our spec is affliction
|
||||||
CurrentSpec = SPEC_WARLOCK_AFFLICTION
|
CurrentSpec = SPEC_WARLOCK_AFFLICTION
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -205,6 +236,10 @@ function ShardCounter.prototype:GetDefaultSettings()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function ShardCounter.prototype:GetRuneTexture(rune)
|
function ShardCounter.prototype:GetRuneTexture(rune)
|
||||||
|
if IceHUD.WowVer >= 70200 then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
if not rune or rune ~= tonumber(rune) then
|
if not rune or rune ~= tonumber(rune) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -222,6 +257,10 @@ function ShardCounter.prototype:GetRuneTexture(rune)
|
|||||||
return "Interface\\PlayerFrame\\UI-WarlockShard"
|
return "Interface\\PlayerFrame\\UI-WarlockShard"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function ShardCounter.prototype:GetRuneAtlas(rune)
|
||||||
|
return "Warlock-ReadyShard"
|
||||||
|
end
|
||||||
|
|
||||||
function ShardCounter.prototype:ShowBlizz()
|
function ShardCounter.prototype:ShowBlizz()
|
||||||
WarlockPowerFrame:Show()
|
WarlockPowerFrame:Show()
|
||||||
|
|
||||||
|
@ -29,6 +29,11 @@ if IceHUD.WowVer >= 50000 then
|
|||||||
gapPerComboPoint = 6
|
gapPerComboPoint = 6
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function SliceAndDice.prototype:init()
|
function SliceAndDice.prototype:init()
|
||||||
SliceAndDice.super.prototype.init(self, "SliceAndDice", "player")
|
SliceAndDice.super.prototype.init(self, "SliceAndDice", "player")
|
||||||
@ -53,7 +58,7 @@ function SliceAndDice.prototype:Enable(core)
|
|||||||
if IceHUD.WowVer < 70000 then
|
if IceHUD.WowVer < 70000 then
|
||||||
self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
|
self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
|
||||||
else
|
else
|
||||||
self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
|
||||||
end
|
end
|
||||||
|
|
||||||
if not self.moduleSettings.alwaysFullAlpha then
|
if not self.moduleSettings.alwaysFullAlpha then
|
||||||
@ -70,7 +75,7 @@ function SliceAndDice.prototype:Disable(core)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function SliceAndDice.prototype:ComboPointsChanged(...)
|
function SliceAndDice.prototype:ComboPointsChanged(...)
|
||||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -205,15 +210,15 @@ end
|
|||||||
|
|
||||||
function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
|
function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
|
||||||
local i = 1
|
local i = 1
|
||||||
local buff, rank, texture, count, type, duration, endTime, remaining
|
local buff, _, texture, duration, endTime, remaining
|
||||||
if IceHUD.WowVer >= 30000 then
|
if IceHUD.WowVer < 80000 then
|
||||||
buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
|
buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||||
else
|
else
|
||||||
buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
|
buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||||
end
|
end
|
||||||
|
|
||||||
while buff do
|
while buff do
|
||||||
if (texture and string.match(texture, buffName)) then
|
if (texture and (type(buffName) == 'string' and string.match(texture, buffName) or texture == buffName)) then
|
||||||
if endTime and not remaining then
|
if endTime and not remaining then
|
||||||
remaining = endTime - GetTime()
|
remaining = endTime - GetTime()
|
||||||
end
|
end
|
||||||
@ -222,10 +227,10 @@ function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
|
|||||||
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
|
|
||||||
if IceHUD.WowVer >= 30000 then
|
if IceHUD.WowVer < 80000 then
|
||||||
buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
|
buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||||
else
|
else
|
||||||
buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
|
buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -275,7 +280,7 @@ function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
|
|||||||
local remaining = nil
|
local remaining = nil
|
||||||
|
|
||||||
if not fromUpdate or IceHUD.WowVer < 30000 then
|
if not fromUpdate or IceHUD.WowVer < 30000 then
|
||||||
sndDuration, remaining = self:GetBuffDuration(self.unit, "Ability_Rogue_SliceDice")
|
sndDuration, remaining = self:GetBuffDuration(self.unit, IceHUD.WowVer < 80000 and "Ability_Rogue_SliceDice" or 132306)
|
||||||
|
|
||||||
if not remaining then
|
if not remaining then
|
||||||
sndEndTime = 0
|
sndEndTime = 0
|
||||||
|
@ -13,6 +13,7 @@ local ModerateID = 124274
|
|||||||
local HeavyID = 124273
|
local HeavyID = 124273
|
||||||
local StaggerID = 124255
|
local StaggerID = 124255
|
||||||
local staggerNames = {"", "", ""}
|
local staggerNames = {"", "", ""}
|
||||||
|
local staggerIds = {LightID, ModerateID, HeavyID}
|
||||||
|
|
||||||
local MinLevel = 10
|
local MinLevel = 10
|
||||||
|
|
||||||
@ -71,7 +72,7 @@ function StaggerBar.prototype:GetOptions()
|
|||||||
name = "Max Percent",
|
name = "Max Percent",
|
||||||
desc = "Maximum percentage of your maximum health for the Stagger bar to represent. I.e, if set to 20%, the bar will be full when the Stagger damage over time effect is dealing 20% of your maximum health per second.",
|
desc = "Maximum percentage of your maximum health for the Stagger bar to represent. I.e, if set to 20%, the bar will be full when the Stagger damage over time effect is dealing 20% of your maximum health per second.",
|
||||||
min = 0,
|
min = 0,
|
||||||
max = 50,
|
max = 100,
|
||||||
step = 1,
|
step = 1,
|
||||||
get = function()
|
get = function()
|
||||||
return self.moduleSettings.maxPercent
|
return self.moduleSettings.maxPercent
|
||||||
@ -183,13 +184,13 @@ function StaggerBar.prototype:GetDebuffInfo()
|
|||||||
local staggerLevel = 1
|
local staggerLevel = 1
|
||||||
|
|
||||||
for i = 1, IceCore.BuffLimit do
|
for i = 1, IceCore.BuffLimit do
|
||||||
local debuffID = select(11, UnitDebuff(self.unit, i))
|
local debuffID = select(IceHUD.WowVer < 80000 and 11 or 10, UnitDebuff(self.unit, i))
|
||||||
|
|
||||||
if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
|
if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
|
||||||
local spellName = select(1, UnitDebuff(self.unit, i))
|
local spellName = UnitDebuff(self.unit, i)
|
||||||
|
|
||||||
duration = select(6, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
duration = select(IceHUD.WowVer < 80000 and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||||
amount = select(15, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
amount = select(IceHUD.WowVer < 80000 and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||||
staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
|
staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
|
||||||
|
|
||||||
break
|
break
|
||||||
@ -201,9 +202,14 @@ function StaggerBar.prototype:GetDebuffInfo()
|
|||||||
self.staggerLevel = staggerLevel or 1
|
self.staggerLevel = staggerLevel or 1
|
||||||
end
|
end
|
||||||
|
|
||||||
function StaggerBar.prototype:COMBAT_LOG_EVENT_UNFILTERED(_, timestamp, event, hideCaster, sourceGUID, sourceName, sourceFlags, sourceFlags2, destGUID, destName, destFlags, destFlags2, spellID)
|
function StaggerBar.prototype:COMBAT_LOG_EVENT_UNFILTERED(...)
|
||||||
if destName == playerName then
|
local eventArgs = {...}
|
||||||
if spellID == StaggerID or event == "SWING_DAMAGE" or event == "SPELL_AURA_APPLIED" or event == "SPELL_AURA_REMOVED" then
|
if (CombatLogGetCurrentEventInfo) then
|
||||||
|
eventArgs = {CombatLogGetCurrentEventInfo()}
|
||||||
|
end
|
||||||
|
|
||||||
|
if eventArgs[9] == playerName then
|
||||||
|
if eventArgs[12] == StaggerID or eventArgs[2] == "SWING_DAMAGE" or eventArgs[2] == "SPELL_AURA_APPLIED" or eventArgs[2] == "SPELL_AURA_REMOVED" then
|
||||||
self:UpdateStaggerBar()
|
self:UpdateStaggerBar()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -216,7 +222,7 @@ function StaggerBar.prototype:UpdateStaggerBar()
|
|||||||
local maxHealth = UnitHealthMax(self.unit)
|
local maxHealth = UnitHealthMax(self.unit)
|
||||||
local scale = IceHUD:Clamp((self.amount / maxHealth) * (100 / self.moduleSettings.maxPercent), 0, 1)
|
local scale = IceHUD:Clamp((self.amount / maxHealth) * (100 / self.moduleSettings.maxPercent), 0, 1)
|
||||||
|
|
||||||
if self.amount > 0 and (IceHUD.WowVer >= 7000 or self.duration <= 10) then
|
if self.amount > 0 and (IceHUD.WowVer >= 70000 or self.duration <= 10) then
|
||||||
-- self.timerFrame.bar:SetVertexColor(self:GetColor("StaggerTime", self.moduleSettings.timerAlpha))
|
-- self.timerFrame.bar:SetVertexColor(self:GetColor("StaggerTime", self.moduleSettings.timerAlpha))
|
||||||
self:UpdateBar(scale or 0, "Stagger"..self.staggerLevel)
|
self:UpdateBar(scale or 0, "Stagger"..self.staggerLevel)
|
||||||
self:UpdateShown()
|
self:UpdateShown()
|
||||||
@ -227,8 +233,20 @@ function StaggerBar.prototype:UpdateStaggerBar()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function StaggerBar.prototype:GetDebuffDuration(unitName, buffName)
|
function StaggerBar.prototype:GetDebuffDuration(unitName, buffId)
|
||||||
local name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
|
local name, _, duration, endTime
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
|
||||||
|
else
|
||||||
|
for i = 1, IceCore.BuffLimit do
|
||||||
|
local id
|
||||||
|
name, _, _, _, duration, endTime, _, _, _, id = UnitDebuff(unitName, i)
|
||||||
|
|
||||||
|
if id == buffId then
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if name then
|
if name then
|
||||||
return duration, endTime - GetTime()
|
return duration, endTime - GetTime()
|
||||||
@ -255,7 +273,7 @@ function StaggerBar.prototype:UpdateTimerFrame(event, unit, fromUpdate)
|
|||||||
|
|
||||||
if not fromUpdate then
|
if not fromUpdate then
|
||||||
for i = 1, 3 do
|
for i = 1, 3 do
|
||||||
self.StaggerDuration, remaining = self:GetDebuffDuration(self.unit, staggerNames[i])
|
self.StaggerDuration, remaining = self:GetDebuffDuration(self.unit, staggerIds[i])
|
||||||
|
|
||||||
if remaining then
|
if remaining then
|
||||||
break
|
break
|
||||||
|
@ -63,12 +63,22 @@ function IceTargetAbsorb.prototype:UpdateAbsorbAmount(event, unit)
|
|||||||
self.highestAbsorbSinceLastZero = absorbAmount
|
self.highestAbsorbSinceLastZero = absorbAmount
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self.absorbPercent = self.highestAbsorbSinceLastZero ~= 0 and absorbAmount / self.highestAbsorbSinceLastZero or 0
|
||||||
|
|
||||||
if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
|
if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
else
|
else
|
||||||
self:Show(true)
|
self:Show(true)
|
||||||
self:UpdateBar(absorbAmount / self.highestAbsorbSinceLastZero, self.ColorName)
|
self:UpdateBar(absorbAmount / self.highestAbsorbSinceLastZero, self.ColorName)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||||
|
if (self.PlayerAltManaMax ~= 100) then
|
||||||
|
self:SetBottomText1(self:GetFormattedText(self:Round(absorbAmount)), self.ColorName)
|
||||||
|
else
|
||||||
|
self:SetBottomText1()
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceTargetAbsorb.prototype:Disable(core)
|
function IceTargetAbsorb.prototype:Disable(core)
|
||||||
|
@ -315,7 +315,12 @@ end
|
|||||||
|
|
||||||
function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
|
function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
|
||||||
local i = 1
|
local i = 1
|
||||||
local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||||
|
else
|
||||||
|
debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||||
|
end
|
||||||
local isMine = unitCaster == "player"
|
local isMine = unitCaster == "player"
|
||||||
local result = {nil, nil, nil}
|
local result = {nil, nil, nil}
|
||||||
local remaining
|
local remaining
|
||||||
@ -335,7 +340,11 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
|
|||||||
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
|
|
||||||
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||||
|
else
|
||||||
|
debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||||
|
end
|
||||||
isMine = unitCaster == "player"
|
isMine = unitCaster == "player"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -82,15 +82,17 @@ function TargetCast.prototype:TargetChanged(unit)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local spell, _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
|
local spell = UnitCastingInfo(self.unit)
|
||||||
if (spell) then
|
local notInterruptible = select(IceHUD.WowVer < 80000 and 9 or 8, UnitCastingInfo(self.unit))
|
||||||
|
if spell then
|
||||||
self.notInterruptible = notInterruptibleCast
|
self.notInterruptible = notInterruptibleCast
|
||||||
self:StartBar(IceCastBar.Actions.Cast)
|
self:StartBar(IceCastBar.Actions.Cast)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local channel, _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
|
local channel = UnitChannelInfo(self.unit)
|
||||||
if (channel) then
|
notInterruptible = select(IceHUD.WowVer < 80000 and 8 or 7, UnitChannelInfo(self.unit))
|
||||||
|
if channel then
|
||||||
self.notInterruptible = notInterruptibleChannel
|
self.notInterruptible = notInterruptibleChannel
|
||||||
self:StartBar(IceCastBar.Actions.Channel)
|
self:StartBar(IceCastBar.Actions.Channel)
|
||||||
return
|
return
|
||||||
@ -167,9 +169,11 @@ function TargetCast.prototype:GetOptions()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function TargetCast.prototype:StartBar(action, message)
|
function TargetCast.prototype:StartBar(action, message)
|
||||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, castId, notInterruptible = UnitCastingInfo(self.unit)
|
local spell = UnitCastingInfo(self.unit)
|
||||||
if not (spell) then
|
local notInterruptible = select(IceHUD.WowVer < 80000 and 9 or 8, UnitCastingInfo(self.unit))
|
||||||
spell, rank, displayName, icon, startTime, endTime, isTradeSkill, notInterruptible = UnitChannelInfo(self.unit)
|
if not spell then
|
||||||
|
spell = UnitChannelInfo(self.unit)
|
||||||
|
notInterruptible = select(IceHUD.WowVer < 80000 and 8 or 7, UnitChannelInfo(self.unit))
|
||||||
end
|
end
|
||||||
|
|
||||||
if not spell then
|
if not spell then
|
||||||
|
@ -972,17 +972,6 @@ function IceTargetHealth.prototype:UpdateRaidTargetIcon()
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function IceTargetHealth.prototype:Round(health)
|
|
||||||
if (health > 1000000) then
|
|
||||||
return IceHUD:MathRound(health/1000000, 1) .. "M"
|
|
||||||
end
|
|
||||||
if (health > 1000) then
|
|
||||||
return IceHUD:MathRound(health/1000, 1) .. "k"
|
|
||||||
end
|
|
||||||
return health
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
function IceTargetHealth.prototype:CheckPvP()
|
function IceTargetHealth.prototype:CheckPvP()
|
||||||
local pvpMode = nil
|
local pvpMode = nil
|
||||||
local minx, maxx, miny, maxy
|
local minx, maxx, miny, maxy
|
||||||
@ -1074,9 +1063,9 @@ function IceTargetHealth.prototype:CheckPartyRole()
|
|||||||
if self.configMode or IceHUD:GetIsInLFGGroup() then
|
if self.configMode or IceHUD:GetIsInLFGGroup() then
|
||||||
if self.configMode or self.moduleSettings.showPartyRoleIcon then
|
if self.configMode or self.moduleSettings.showPartyRoleIcon then
|
||||||
local isTank, isHeal, isDPS
|
local isTank, isHeal, isDPS
|
||||||
local proposalExists, typeID, id, name
|
local proposalExists, typeID, id, subtypeID, name
|
||||||
local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
|
local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
|
||||||
proposalExists, typeID, id, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||||
|
|
||||||
local p = self.unit
|
local p = self.unit
|
||||||
if IceHUD.WowVer < 40000 then
|
if IceHUD.WowVer < 40000 then
|
||||||
|
@ -129,7 +129,9 @@ function IceTargetInfo.prototype:Enable(core)
|
|||||||
self:RegisterEvent("UNIT_LEVEL", "TargetLevel")
|
self:RegisterEvent("UNIT_LEVEL", "TargetLevel")
|
||||||
|
|
||||||
self:RegisterEvent("UNIT_FLAGS", "TargetFlags")
|
self:RegisterEvent("UNIT_FLAGS", "TargetFlags")
|
||||||
self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
|
||||||
|
end
|
||||||
|
|
||||||
self:RegisterEvent("RAID_TARGET_UPDATE", "UpdateRaidTargetIcon")
|
self:RegisterEvent("RAID_TARGET_UPDATE", "UpdateRaidTargetIcon")
|
||||||
|
|
||||||
@ -958,6 +960,23 @@ function IceTargetInfo.prototype:GetOptions()
|
|||||||
order = 39.3,
|
order = 39.3,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opts["showRaidIcon"] = {
|
||||||
|
type = 'toggle',
|
||||||
|
name = L['Show raid icon'],
|
||||||
|
desc = L['Whether or not to show the raid icon for this unit.'],
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.showRaidIcon
|
||||||
|
end,
|
||||||
|
set = function(info, v)
|
||||||
|
self.moduleSettings.showRaidIcon = v
|
||||||
|
self:UpdateRaidTargetIcon()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
order = 37.02,
|
||||||
|
}
|
||||||
|
|
||||||
return opts
|
return opts
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -1011,6 +1030,7 @@ function IceTargetInfo.prototype:GetDefaultSettings()
|
|||||||
["sortByExpiration"] = true,
|
["sortByExpiration"] = true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
defaults["showRaidIcon"] = true
|
||||||
|
|
||||||
return defaults
|
return defaults
|
||||||
end
|
end
|
||||||
@ -1389,7 +1409,12 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
|
|||||||
|
|
||||||
if self.moduleSettings.auras[aura].show then
|
if self.moduleSettings.auras[aura].show then
|
||||||
for i = 1, IceCore.BuffLimit do
|
for i = 1, IceCore.BuffLimit do
|
||||||
local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
|
local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
|
||||||
|
else
|
||||||
|
name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
|
||||||
|
end
|
||||||
local isFromMe = (unitCaster == "player")
|
local isFromMe = (unitCaster == "player")
|
||||||
|
|
||||||
if not icon and IceHUD.IceCore:IsInConfigMode() and UnitExists(self.unit) then
|
if not icon and IceHUD.IceCore:IsInConfigMode() and UnitExists(self.unit) then
|
||||||
@ -1480,7 +1505,7 @@ function IceTargetInfo.prototype:AuraChanged(event, unit)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceTargetInfo.prototype:UpdateRaidTargetIcon()
|
function IceTargetInfo.prototype:UpdateRaidTargetIcon()
|
||||||
if not (UnitExists(self.unit)) then
|
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then
|
||||||
self.frame.raidIcon:Hide()
|
self.frame.raidIcon:Hide()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -146,7 +146,12 @@ end
|
|||||||
|
|
||||||
function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
|
function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
|
||||||
local i = 1
|
local i = 1
|
||||||
local buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
local buff, rank, texture, count, buffType, duration, endTime, unitCaster
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||||
|
else
|
||||||
|
buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||||
|
end
|
||||||
local isMine = unitCaster == "player"
|
local isMine = unitCaster == "player"
|
||||||
local result = {nil, nil, nil}
|
local result = {nil, nil, nil}
|
||||||
local remaining
|
local remaining
|
||||||
@ -173,7 +178,11 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
|
|||||||
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
|
|
||||||
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||||
|
else
|
||||||
|
buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||||
|
end
|
||||||
isMine = unitCaster == "player"
|
isMine = unitCaster == "player"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -4,6 +4,28 @@ IceTargetMana.prototype.registerEvents = true
|
|||||||
IceTargetMana.prototype.color = nil
|
IceTargetMana.prototype.color = nil
|
||||||
IceTargetMana.prototype.determineColor = true
|
IceTargetMana.prototype.determineColor = true
|
||||||
|
|
||||||
|
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||||
|
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||||
|
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||||
|
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||||
|
local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
|
||||||
|
local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
|
||||||
|
local SPELL_POWER_FURY = SPELL_POWER_FURY
|
||||||
|
local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
|
||||||
|
local SPELL_POWER_PAIN = SPELL_POWER_PAIN
|
||||||
|
local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
|
||||||
|
if IceHUD.WowVer >= 80000 then
|
||||||
|
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||||
|
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||||
|
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||||
|
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||||
|
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
|
||||||
|
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||||
|
SPELL_POWER_FURY = Enum.PowerType.Fury
|
||||||
|
SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
|
||||||
|
SPELL_POWER_PAIN = Enum.PowerType.Pain
|
||||||
|
SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function IceTargetMana.prototype:init(moduleName, unit)
|
function IceTargetMana.prototype:init(moduleName, unit)
|
||||||
@ -45,8 +67,10 @@ function IceTargetMana.prototype:Enable(core)
|
|||||||
|
|
||||||
if self.registerEvents then
|
if self.registerEvents then
|
||||||
if IceHUD.WowVer >= 40000 then
|
if IceHUD.WowVer >= 40000 then
|
||||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
if IceHUD.WowVer < 80000 then
|
||||||
|
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||||
|
end
|
||||||
else
|
else
|
||||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||||
self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
|
self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
|
||||||
|
@ -485,7 +485,12 @@ function TargetOfTarget.prototype:UpdateBuffs()
|
|||||||
|
|
||||||
if (self.moduleSettings.showDebuffs) then
|
if (self.moduleSettings.showDebuffs) then
|
||||||
for i = 1, IceCore.BuffLimit do
|
for i = 1, IceCore.BuffLimit do
|
||||||
local buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
local buffName, buffRank, buffTexture, buffApplications
|
||||||
|
if IceHUD.WowVer < 80000 then
|
||||||
|
buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
||||||
|
else
|
||||||
|
buffName, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
||||||
|
end
|
||||||
|
|
||||||
if (buffApplications and (buffApplications > 1)) then
|
if (buffApplications and (buffApplications > 1)) then
|
||||||
debuffs = debuffs + 1
|
debuffs = debuffs + 1
|
||||||
|
@ -63,7 +63,7 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
|
|||||||
Type /icehud, expand Module Settings, expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
|
Type /icehud, expand Module Settings, expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
|
||||||
|
|
||||||
1. **Which module displays Monk Chi power?**
|
1. **Which module displays Monk Chi power?**
|
||||||
This module is called HarmonyPower. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. I feel like it's too late to change now that many people are familiar with the Harmony name.
|
Prior to v1.11.2, this module was called HarmonyPower. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. IceHUD v1.11.2 changed this module to be called Chi.
|
||||||
|
|
||||||
1. **How do I add commas/periods into big numbers like health?**
|
1. **How do I add commas/periods into big numbers like health?**
|
||||||
If you have DogTags enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
|
If you have DogTags enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
|
||||||
@ -78,4 +78,4 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
|
|||||||
Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You can disable it in the Game options -> Interface -> Names -> Personal Resource Display.
|
Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You can disable it in the Game options -> Interface -> Names -> Personal Resource Display.
|
||||||
|
|
||||||
|
|
||||||
See [here](http://www.wowace.com/addons/ice-hud/tickets/113-basic-guide-to-texture-creation/) for a user-created guide to creating new IceHUD textures.
|
See [here](https://www.wowace.com/projects/ice-hud/issues/113) for a user-created guide to creating new IceHUD textures.
|
||||||
|
Reference in New Issue
Block a user