mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 22:51:53 -05:00
Compare commits
54 Commits
v1.14.0-al
...
v1.14.18
Author | SHA1 | Date | |
---|---|---|---|
1db8545b63
|
|||
18fa31807c
|
|||
594ea0a3e3
|
|||
cb83a3f63f
|
|||
077286fd5f
|
|||
a50a313314
|
|||
271bb38a69
|
|||
0e11a40d3a
|
|||
5020279748
|
|||
cfaa09a541
|
|||
a0ed3ae6e6
|
|||
7709cb9130
|
|||
c1f631b732
|
|||
6c44ddc93a
|
|||
8b45079d38
|
|||
b1adbe8090
|
|||
01a017c179
|
|||
b8aece0da3
|
|||
6b9b4a358c
|
|||
72adca99f9
|
|||
f8e7cf06d6
|
|||
059808c980
|
|||
689df94d55
|
|||
d49884198d
|
|||
8627ad39d5
|
|||
8c62a841fd
|
|||
7496475ff4
|
|||
c5c44edf64
|
|||
59f2792ce8
|
|||
a80daface7
|
|||
f6db2f3b7c
|
|||
5d09cad6cb
|
|||
8fc2e326aa
|
|||
d775603ec0
|
|||
70bba2f186
|
|||
8ac9bee610
|
|||
07bda8e84d
|
|||
5712114eb8
|
|||
2a0db2eb01
|
|||
7d32b6d8c6
|
|||
60d44601d1
|
|||
b3cf33a945
|
|||
3ddc2f9d2f
|
|||
d6adaedc93
|
|||
6a985bc67a
|
|||
3a5e58bf34 | |||
b467af21c0
|
|||
acc400de6e
|
|||
cac0deeb3c
|
|||
e951d40b12
|
|||
46883e355b
|
|||
004df582ef
|
|||
b8cf6e90b0
|
|||
d0c06c7b55
|
5
.pkgmeta
5
.pkgmeta
@ -37,6 +37,9 @@ externals:
|
|||||||
libs/AceLocale-3.0:
|
libs/AceLocale-3.0:
|
||||||
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
|
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
|
||||||
tag: latest
|
tag: latest
|
||||||
|
libs/AceHook-3.0:
|
||||||
|
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceHook-3.0
|
||||||
|
tag: latest
|
||||||
libs/LibRangeCheck-2.0:
|
libs/LibRangeCheck-2.0:
|
||||||
url: https://github.com/WeakAuras/LibRangeCheck-2.0/
|
url: https://github.com/WeakAuras/LibRangeCheck-2.0/
|
||||||
libs/LibSharedMedia-3.0:
|
libs/LibSharedMedia-3.0:
|
||||||
@ -65,6 +68,8 @@ tools-used:
|
|||||||
|
|
||||||
ignore:
|
ignore:
|
||||||
- readme.md
|
- readme.md
|
||||||
|
- FUNDING.yml
|
||||||
|
- this_version.md
|
||||||
|
|
||||||
manual-changelog: this_version.md
|
manual-changelog: this_version.md
|
||||||
|
|
||||||
|
3
FUNDING.yml
Normal file
3
FUNDING.yml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
github: parnic
|
||||||
|
ko_fi: parnic
|
||||||
|
custom: "https://www.paypal.me/parnic"
|
158
IceCastBar.lua
158
IceCastBar.lua
@ -3,7 +3,7 @@ IceCastBar = IceCore_CreateClass(IceBarElement)
|
|||||||
|
|
||||||
local IceHUD = _G.IceHUD
|
local IceHUD = _G.IceHUD
|
||||||
|
|
||||||
IceCastBar.Actions = { None = 0, Cast = 1, Channel = 2, Instant = 3, Success = 4, Failure = 5 }
|
IceCastBar.Actions = { None = 0, Cast = 1, Channel = 2, Instant = 3, Success = 4, Failure = 5, ReverseChannel = 6 }
|
||||||
|
|
||||||
IceCastBar.prototype.action = nil
|
IceCastBar.prototype.action = nil
|
||||||
IceCastBar.prototype.actionStartTime = nil
|
IceCastBar.prototype.actionStartTime = nil
|
||||||
@ -49,6 +49,13 @@ function IceCastBar.prototype:init(name)
|
|||||||
self:SetDefaultColor("CastChanneling", 242, 242, 10)
|
self:SetDefaultColor("CastChanneling", 242, 242, 10)
|
||||||
self:SetDefaultColor("CastSuccess", 242, 242, 70)
|
self:SetDefaultColor("CastSuccess", 242, 242, 70)
|
||||||
self:SetDefaultColor("CastFail", 1, 0, 0)
|
self:SetDefaultColor("CastFail", 1, 0, 0)
|
||||||
|
if GetUnitEmpowerMinHoldTime then
|
||||||
|
self:SetDefaultColor("EmpowerStage0", 165, 165, 165)
|
||||||
|
self:SetDefaultColor("EmpowerStage1", 242, 42, 10)
|
||||||
|
self:SetDefaultColor("EmpowerStage2", 242, 142, 10)
|
||||||
|
self:SetDefaultColor("EmpowerStage3", 242, 242, 10)
|
||||||
|
self:SetDefaultColor("EmpowerStage4", 242, 242, 242)
|
||||||
|
end
|
||||||
self.unit = "player"
|
self.unit = "player"
|
||||||
|
|
||||||
self.delay = 0
|
self.delay = 0
|
||||||
@ -109,6 +116,12 @@ function IceCastBar.prototype:Enable(core)
|
|||||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
|
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
|
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
|
||||||
|
|
||||||
|
if GetUnitEmpowerHoldAtMaxTime then
|
||||||
|
self:RegisterEvent("UNIT_SPELLCAST_EMPOWER_START", "SpellCastChannelStart")
|
||||||
|
self:RegisterEvent("UNIT_SPELLCAST_EMPOWER_UPDATE", "SpellCastChannelUpdate")
|
||||||
|
self:RegisterEvent("UNIT_SPELLCAST_EMPOWER_STOP", "SpellCastChannelStop")
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
end
|
end
|
||||||
@ -311,7 +324,13 @@ function IceCastBar.prototype:PositionIcons()
|
|||||||
self.barFrame.icon:SetHeight(AuraIconHeight * self.moduleSettings.auraIconScale)
|
self.barFrame.icon:SetHeight(AuraIconHeight * self.moduleSettings.auraIconScale)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceCastBar.prototype:GetRemainingCastTime()
|
||||||
|
return self.actionStartTime + self.actionDuration - GetTime()
|
||||||
|
end
|
||||||
|
|
||||||
|
function IceCastBar.prototype:GetCurrentCastDurationMs()
|
||||||
|
return (GetTime() - (self.actionStartTime or GetTime())) * 1000
|
||||||
|
end
|
||||||
|
|
||||||
-- OnUpdate handler
|
-- OnUpdate handler
|
||||||
function IceCastBar.prototype:MyOnUpdate()
|
function IceCastBar.prototype:MyOnUpdate()
|
||||||
@ -322,17 +341,15 @@ function IceCastBar.prototype:MyOnUpdate()
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local time = GetTime()
|
|
||||||
|
|
||||||
self:Update()
|
self:Update()
|
||||||
self:SetTextAlpha()
|
self:SetTextAlpha()
|
||||||
|
|
||||||
-- handle casting and channeling
|
-- handle casting and channeling
|
||||||
if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel) then
|
if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel) then
|
||||||
local remainingTime = self.actionStartTime + self.actionDuration - time
|
local remainingTime = self:GetRemainingCastTime()
|
||||||
local scale = 1 - (self.actionDuration ~= 0 and remainingTime / self.actionDuration or 0)
|
local scale = 1 - (self.actionDuration ~= 0 and remainingTime / self.actionDuration or 0)
|
||||||
|
|
||||||
if (self.moduleSettings.reverseChannel and self.action == IceCastBar.Actions.Channel) then
|
if self.action == IceCastBar.Actions.ReverseChannel then
|
||||||
scale = self.actionDuration ~= 0 and remainingTime / self.actionDuration or 0
|
scale = self.actionDuration ~= 0 and remainingTime / self.actionDuration or 0
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -343,14 +360,22 @@ function IceCastBar.prototype:MyOnUpdate()
|
|||||||
end
|
end
|
||||||
|
|
||||||
local timeString = self.moduleSettings.showCastTime and string.format("%.1fs ", remainingTime) or ""
|
local timeString = self.moduleSettings.showCastTime and string.format("%.1fs ", remainingTime) or ""
|
||||||
self:SetBottomText1(timeString .. self.actionMessage)
|
local empowerString = self.NumStages ~= nil and (L["Stage %d"]):format(self:GetCurrentStage()) or ""
|
||||||
|
local line1 = timeString .. self.actionMessage
|
||||||
|
if self.moduleSettings.empowerStageTextDisplay == "TOPLINE" then
|
||||||
|
line1 = line1 .. " " .. empowerString
|
||||||
|
end
|
||||||
|
if self.moduleSettings.empowerStageTextDisplay == "BOTTOMLINE" then
|
||||||
|
self:SetBottomText2(empowerString)
|
||||||
|
end
|
||||||
|
self:SetBottomText1(line1)
|
||||||
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
-- stop bar if casting or channeling is done (in theory this should not be needed)
|
-- stop bar if casting or channeling is done (in theory this should not be needed)
|
||||||
if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel) then
|
if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel) then
|
||||||
self:StopBar()
|
self:StopBar()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -361,13 +386,15 @@ function IceCastBar.prototype:MyOnUpdate()
|
|||||||
self.action == IceCastBar.Actions.Success or
|
self.action == IceCastBar.Actions.Success or
|
||||||
self.action == IceCastBar.Actions.Failure)
|
self.action == IceCastBar.Actions.Failure)
|
||||||
then
|
then
|
||||||
local scale = time - self.actionStartTime
|
local scale = GetTime() - self.actionStartTime
|
||||||
|
|
||||||
if (scale > 1) then
|
if (scale > 1) then
|
||||||
self:StopBar()
|
self:StopBar()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self:UpdateBar(1, self:GetCurrentCastingColor())
|
||||||
|
|
||||||
if (self.action == IceCastBar.Actions.Failure) then
|
if (self.action == IceCastBar.Actions.Failure) then
|
||||||
self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
|
self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
|
||||||
else
|
else
|
||||||
@ -381,12 +408,60 @@ function IceCastBar.prototype:MyOnUpdate()
|
|||||||
self:StopBar()
|
self:StopBar()
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:GetCurrentCastingColor()
|
function IceCastBar.prototype:GetStageDuration(stage)
|
||||||
local updateColor = "CastCasting"
|
if not GetUnitEmpowerMinHoldTime then
|
||||||
if self.action == IceCastBar.Actions.Channel then
|
return 0
|
||||||
updateColor = "CastChanneling"
|
|
||||||
end
|
end
|
||||||
return updateColor
|
|
||||||
|
if stage == 0 then
|
||||||
|
return GetUnitEmpowerMinHoldTime(self.unit)
|
||||||
|
end
|
||||||
|
|
||||||
|
return GetUnitEmpowerStageDuration(self.unit, stage);
|
||||||
|
end
|
||||||
|
|
||||||
|
function IceCastBar.prototype:GetDurationUpToStage(stage)
|
||||||
|
if stage == nil or stage < 0 then
|
||||||
|
return 0
|
||||||
|
end
|
||||||
|
|
||||||
|
local total = 0
|
||||||
|
for i=0,stage-1 do
|
||||||
|
total = total + self:GetStageDuration(i)
|
||||||
|
end
|
||||||
|
|
||||||
|
return total
|
||||||
|
end
|
||||||
|
|
||||||
|
function IceCastBar.prototype:GetCurrentStage()
|
||||||
|
if not GetUnitEmpowerMinHoldTime then
|
||||||
|
return 0
|
||||||
|
end
|
||||||
|
|
||||||
|
local castDuration = self:GetCurrentCastDurationMs()
|
||||||
|
for i=1,self.NumStages do
|
||||||
|
if castDuration < self:GetDurationUpToStage(i) then
|
||||||
|
return i - 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return self.NumStages
|
||||||
|
end
|
||||||
|
|
||||||
|
function IceCastBar.prototype:IsCastingEmpowerSpell()
|
||||||
|
return self.NumStages ~= nil
|
||||||
|
end
|
||||||
|
|
||||||
|
function IceCastBar.prototype:GetCurrentCastingColor()
|
||||||
|
if self:IsCastingEmpowerSpell() then
|
||||||
|
return ("EmpowerStage%d"):format(self:GetCurrentStage())
|
||||||
|
end
|
||||||
|
|
||||||
|
if self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel then
|
||||||
|
return "CastChanneling"
|
||||||
|
end
|
||||||
|
|
||||||
|
return "CastCasting"
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
|
function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
|
||||||
@ -405,8 +480,8 @@ function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function IceCastBar.prototype:StartBar(action, message)
|
function IceCastBar.prototype:StartBar(action, message, spellId)
|
||||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill
|
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, numStages
|
||||||
if IceHUD.SpellFunctionsReturnRank then
|
if IceHUD.SpellFunctionsReturnRank then
|
||||||
spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
||||||
else
|
else
|
||||||
@ -416,7 +491,28 @@ function IceCastBar.prototype:StartBar(action, message)
|
|||||||
if IceHUD.SpellFunctionsReturnRank then
|
if IceHUD.SpellFunctionsReturnRank then
|
||||||
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
||||||
else
|
else
|
||||||
spell, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
spell, displayName, icon, startTime, endTime, isTradeSkill, _, _, _, numStages = UnitChannelInfo(self.unit)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if spellId and not spell then
|
||||||
|
spell, rank, icon = GetSpellInfo(spellId)
|
||||||
|
end
|
||||||
|
|
||||||
|
local isChargeSpell = numStages and numStages > 0
|
||||||
|
if isChargeSpell then
|
||||||
|
self.NumStages = numStages
|
||||||
|
endTime = endTime + GetUnitEmpowerHoldAtMaxTime(self.unit)
|
||||||
|
action = IceCastBar.Actions.ReverseChannel
|
||||||
|
else
|
||||||
|
self.NumStages = nil
|
||||||
|
end
|
||||||
|
|
||||||
|
if self.moduleSettings.reverseChannel then
|
||||||
|
if action == IceCastBar.Actions.Channel then
|
||||||
|
action = IceCastBar.Actions.ReverseChannel
|
||||||
|
elseif action == IceCastBar.Actions.ReverseChannel then
|
||||||
|
action = IceCastBar.Actions.Channel
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -424,7 +520,7 @@ function IceCastBar.prototype:StartBar(action, message)
|
|||||||
if LibClassicCasterino and not spell then
|
if LibClassicCasterino and not spell then
|
||||||
self:StopBar()
|
self:StopBar()
|
||||||
elseif not spell then
|
elseif not spell then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if icon ~= nil then
|
if icon ~= nil then
|
||||||
@ -465,6 +561,7 @@ function IceCastBar.prototype:StopBar()
|
|||||||
self.actionDuration = nil
|
self.actionDuration = nil
|
||||||
|
|
||||||
self:SetBottomText1()
|
self:SetBottomText1()
|
||||||
|
self:SetBottomText2()
|
||||||
self:SetScale(0)
|
self:SetScale(0)
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
end
|
end
|
||||||
@ -499,7 +596,7 @@ function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
|
|||||||
IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
|
IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
|
||||||
--UnitCastingInfo(unit)
|
--UnitCastingInfo(unit)
|
||||||
|
|
||||||
self:StartBar(IceCastBar.Actions.Cast)
|
self:StartBar(IceCastBar.Actions.Cast, nil, spellId)
|
||||||
self.current = castGuid
|
self.current = castGuid
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -514,11 +611,13 @@ function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
|
|||||||
|
|
||||||
if (self.action ~= IceCastBar.Actions.Success and
|
if (self.action ~= IceCastBar.Actions.Success and
|
||||||
self.action ~= IceCastBar.Actions.Failure and
|
self.action ~= IceCastBar.Actions.Failure and
|
||||||
self.action ~= IceCastBar.Actions.Channel)
|
self.action ~= IceCastBar.Actions.Channel and
|
||||||
|
self.action ~= IceCastBar.Actions.ReverseChannel)
|
||||||
then
|
then
|
||||||
self:StopBar()
|
self:StopBar()
|
||||||
self.current = nil
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self.current = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@ -532,7 +631,7 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- channeled spells will call ChannelStop, not cast failed
|
-- channeled spells will call ChannelStop, not cast failed
|
||||||
if self.action == IceCastBar.Actions.Channel then
|
if self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -547,7 +646,7 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self:StartBar(IceCastBar.Actions.Failure, "Failed")
|
self:StartBar(IceCastBar.Actions.Failure, "Failed", nil, spellId)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
|
function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
|
||||||
@ -561,7 +660,7 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellI
|
|||||||
|
|
||||||
self.current = nil
|
self.current = nil
|
||||||
|
|
||||||
self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
|
self:StartBar(IceCastBar.Actions.Failure, "Interrupted", spellId)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
|
function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
|
||||||
@ -582,7 +681,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
|||||||
--IceHUD:Debug("SpellCastSucceeded", unit, castGuid, spellId)
|
--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 or self.action == IceCastBar.Actions.ReverseChannel) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -595,7 +694,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, 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), spellId)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -608,7 +707,12 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
|
-- handle special spells that are used for quests or other things that don't apply to the player
|
||||||
|
if self.unit == "player" and not IsPlayerSpell(spellId) then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank), spellId)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
15
IceCore.lua
15
IceCore.lua
@ -115,6 +115,7 @@ function IceCore.prototype:SetupDefaults()
|
|||||||
bHideDuringPetBattles = true,
|
bHideDuringPetBattles = true,
|
||||||
bHideInBarberShop = true,
|
bHideInBarberShop = true,
|
||||||
bHideDuringShellGame = true,
|
bHideDuringShellGame = true,
|
||||||
|
bHideDuringCataloging = true,
|
||||||
},
|
},
|
||||||
global = {
|
global = {
|
||||||
lastRunVersion = 0,
|
lastRunVersion = 0,
|
||||||
@ -284,6 +285,9 @@ function IceCore.prototype:Enable(userToggle)
|
|||||||
self.IceHUDFrame:RegisterEvent("ZONE_CHANGED")
|
self.IceHUDFrame:RegisterEvent("ZONE_CHANGED")
|
||||||
end
|
end
|
||||||
self.IceHUDFrame:RegisterEvent("UNIT_AURA")
|
self.IceHUDFrame:RegisterEvent("UNIT_AURA")
|
||||||
|
self.IceHUDFrame:RegisterEvent("UNIT_ENTERED_VEHICLE")
|
||||||
|
self.IceHUDFrame:RegisterEvent("PLAYER_REGEN_ENABLED", IceHUD.PLAYER_REGEN_ENABLED)
|
||||||
|
self.IceHUDFrame:RegisterEvent("PLAYER_REGEN_DISABLED", IceHUD.PLAYER_REGEN_DISABLED)
|
||||||
self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
|
self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
|
||||||
if (event == "PET_BATTLE_OPENING_START") then
|
if (event == "PET_BATTLE_OPENING_START") then
|
||||||
if IceHUD.IceCore.settings.bHideDuringPetBattles then
|
if IceHUD.IceCore.settings.bHideDuringPetBattles then
|
||||||
@ -301,6 +305,11 @@ function IceCore.prototype:Enable(userToggle)
|
|||||||
if IceHUD.IceCore.settings.bHideInBarberShop then
|
if IceHUD.IceCore.settings.bHideInBarberShop then
|
||||||
self:Show()
|
self:Show()
|
||||||
end
|
end
|
||||||
|
elseif event == "UNIT_ENTERED_VEHICLE" then
|
||||||
|
if IceHUD.IceCore.settings.bHideDuringCataloging and IceHUD:HasAnyBuff("player", IceHUD.CatalogingSpellIDs) then
|
||||||
|
self:RegisterEvent("UNIT_EXITED_VEHICLE")
|
||||||
|
self:Hide()
|
||||||
|
end
|
||||||
elseif (event == "UNIT_AURA") then
|
elseif (event == "UNIT_AURA") then
|
||||||
local unit = ...
|
local unit = ...
|
||||||
if unit ~= "player" then
|
if unit ~= "player" then
|
||||||
@ -310,6 +319,9 @@ function IceCore.prototype:Enable(userToggle)
|
|||||||
if IceHUD.IceCore.settings.bHideDuringShellGame and IceHUD:HasAnyDebuff("player", {IceHUD.ShellGameSpellID}) and UnitInVehicle("player") then
|
if IceHUD.IceCore.settings.bHideDuringShellGame and IceHUD:HasAnyDebuff("player", {IceHUD.ShellGameSpellID}) and UnitInVehicle("player") then
|
||||||
self:RegisterEvent("UNIT_EXITED_VEHICLE")
|
self:RegisterEvent("UNIT_EXITED_VEHICLE")
|
||||||
self:Hide()
|
self:Hide()
|
||||||
|
elseif IceHUD.IceCore.settings.bHideDuringCataloging and IceHUD:HasAnyBuff("player", IceHUD.CatalogingSpellIDs) and UnitInVehicle("player") then
|
||||||
|
self:RegisterEvent("UNIT_EXITED_VEHICLE")
|
||||||
|
self:Hide()
|
||||||
elseif C_Map then
|
elseif C_Map then
|
||||||
local bestMapID = C_Map.GetBestMapForUnit("player")
|
local bestMapID = C_Map.GetBestMapForUnit("player")
|
||||||
if bestMapID ~= ZM_MAP_ID then
|
if bestMapID ~= ZM_MAP_ID then
|
||||||
@ -643,10 +655,11 @@ function IceCore.prototype:GetModuleOptions()
|
|||||||
|
|
||||||
for i = 1, table.getn(self.elements) do
|
for i = 1, table.getn(self.elements) do
|
||||||
local modName = self.elements[i]:GetElementName()
|
local modName = self.elements[i]:GetElementName()
|
||||||
|
local modDesc = self.elements[i]:GetElementDescription()
|
||||||
local opt = self.elements[i]:GetOptions()
|
local opt = self.elements[i]:GetOptions()
|
||||||
options[modName] = {
|
options[modName] = {
|
||||||
type = 'group',
|
type = 'group',
|
||||||
desc = L["Module options"],
|
desc = modDesc,
|
||||||
name = modName,
|
name = modName,
|
||||||
args = opt
|
args = opt
|
||||||
}
|
}
|
||||||
|
@ -63,6 +63,10 @@ function IceElement.prototype:GetElementName()
|
|||||||
return self.elementName
|
return self.elementName
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceElement.prototype:GetElementDescription()
|
||||||
|
return L["Module options"]
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
function IceElement.prototype:Create(parent)
|
function IceElement.prototype:Create(parent)
|
||||||
assert(parent, "IceElement 'parent' can't be nil")
|
assert(parent, "IceElement 'parent' can't be nil")
|
||||||
|
65
IceHUD.lua
65
IceHUD.lua
@ -1,5 +1,5 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
IceHUD = LibStub("AceAddon-3.0"):NewAddon("IceHUD", "AceConsole-3.0")
|
IceHUD = LibStub("AceAddon-3.0"):NewAddon("IceHUD", "AceConsole-3.0", "AceHook-3.0")
|
||||||
|
|
||||||
local IceHUD = IceHUD
|
local IceHUD = IceHUD
|
||||||
|
|
||||||
@ -36,6 +36,7 @@ else
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- compatibility/feature flags
|
-- compatibility/feature flags
|
||||||
|
IceHUD.GetPlayerAuraBySpellID = _G["C_UnitAuras"] and C_UnitAuras.GetPlayerAuraBySpellID
|
||||||
IceHUD.SpellFunctionsReturnRank = IceHUD.WowMain and IceHUD.WowVer < 80000
|
IceHUD.SpellFunctionsReturnRank = IceHUD.WowMain and IceHUD.WowVer < 80000
|
||||||
IceHUD.EventExistsPlayerPetChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
|
IceHUD.EventExistsPlayerPetChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
|
||||||
IceHUD.EventExistsPetBarChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
|
IceHUD.EventExistsPetBarChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
|
||||||
@ -59,6 +60,8 @@ IceHUD.SupportsHealPrediction = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
|
|||||||
IceHUD.UnitGroupRolesReturnsRoleString = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
|
IceHUD.UnitGroupRolesReturnsRoleString = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
|
||||||
IceHUD.ShellGameSpellID = 271571
|
IceHUD.ShellGameSpellID = 271571
|
||||||
IceHUD.HasShellGame = GetSpellInfo(IceHUD.ShellGameSpellID)
|
IceHUD.HasShellGame = GetSpellInfo(IceHUD.ShellGameSpellID)
|
||||||
|
IceHUD.CatalogingSpellIDs = {366290, 372817, 385025, 385635, 386070, 386504, 400043, 403115}
|
||||||
|
IceHUD.HasCataloging = GetSpellInfo(366290)
|
||||||
|
|
||||||
IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
|
IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
|
||||||
|
|
||||||
@ -494,6 +497,16 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
|
|||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Support for Spell IDs
|
||||||
|
if (IceHUD.GetPlayerAuraBySpellID and tonumber(ability) ~= nil) then
|
||||||
|
local aura = C_UnitAuras.GetPlayerAuraBySpellID(ability)
|
||||||
|
if aura ~= nil then
|
||||||
|
return aura.applications
|
||||||
|
else
|
||||||
|
return 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local i = 1
|
local i = 1
|
||||||
local name, _, texture, applications
|
local name, _, texture, applications
|
||||||
if IceHUD.SpellFunctionsReturnRank then
|
if IceHUD.SpellFunctionsReturnRank then
|
||||||
@ -963,3 +976,53 @@ UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()
|
|||||||
UnitPopup_ShowMenu(IceHUD_UnitFrame_DropDown, menu, IceHUD.DropdownUnit, nil, id)
|
UnitPopup_ShowMenu(IceHUD_UnitFrame_DropDown, menu, IceHUD.DropdownUnit, nil, id)
|
||||||
end
|
end
|
||||||
end, "MENU", nil)
|
end, "MENU", nil)
|
||||||
|
|
||||||
|
function IceHUD:OutOfCombatWrapper(func)
|
||||||
|
return function(...)
|
||||||
|
return IceHUD:RunOnLeaveCombat(func, ...)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
do
|
||||||
|
local in_combat = false
|
||||||
|
local in_lockdown = false
|
||||||
|
local actions_to_perform = {}
|
||||||
|
local pool = setmetatable({}, {__mode='k'})
|
||||||
|
function IceHUD:PLAYER_REGEN_ENABLED()
|
||||||
|
in_combat = false
|
||||||
|
in_lockdown = false
|
||||||
|
for i, t in ipairs(actions_to_perform) do
|
||||||
|
t.f(unpack(t, 1, t.n))
|
||||||
|
actions_to_perform[i] = nil
|
||||||
|
wipe(t)
|
||||||
|
pool[t] = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
function IceHUD:PLAYER_REGEN_DISABLED()
|
||||||
|
in_combat = true
|
||||||
|
end
|
||||||
|
function IceHUD:RunOnLeaveCombat(func, ...)
|
||||||
|
if not in_combat then
|
||||||
|
-- out of combat, call right away and return
|
||||||
|
func(...)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if not in_lockdown then
|
||||||
|
in_lockdown = InCombatLockdown() -- still in PLAYER_REGEN_DISABLED
|
||||||
|
if not in_lockdown then
|
||||||
|
func(...)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local t = next(pool) or {}
|
||||||
|
pool[t] = nil
|
||||||
|
|
||||||
|
t.f = func
|
||||||
|
local n = select('#', ...)
|
||||||
|
t.n = n
|
||||||
|
for i = 1, n do
|
||||||
|
t[i] = select(i, ...)
|
||||||
|
end
|
||||||
|
actions_to_perform[#actions_to_perform+1] = t
|
||||||
|
end
|
||||||
|
end
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
## Interface: 100000
|
## Interface: 100007
|
||||||
## Interface-Retail: 100000
|
## Interface-Retail: 100007
|
||||||
## Interface-Classic: 11403
|
## Interface-Classic: 11403
|
||||||
## Interface-BCC: 20504
|
## Interface-BCC: 20504
|
||||||
## Interface-Wrath: 30400
|
## Interface-Wrath: 30401
|
||||||
## 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
|
||||||
@ -99,6 +99,9 @@ modules\Stagger.lua
|
|||||||
modules\PlayerAltMana.lua
|
modules\PlayerAltMana.lua
|
||||||
modules\ArcaneCharges.lua
|
modules\ArcaneCharges.lua
|
||||||
modules\RollTheBones.lua
|
modules\RollTheBones.lua
|
||||||
|
modules\EssencePower.lua
|
||||||
|
modules\DruidEnergy.lua
|
||||||
|
modules\DragonridingVigor.lua
|
||||||
|
|
||||||
#@do-not-package@
|
#@do-not-package@
|
||||||
IceHUD_Options\Json.lua
|
IceHUD_Options\Json.lua
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
## Interface: 100000
|
## Interface: 100007
|
||||||
## Interface-Retail: 100000
|
## Interface-Retail: 100007
|
||||||
## Interface-Classic: 11403
|
## Interface-Classic: 11403
|
||||||
## Interface-BCC: 20504
|
## Interface-BCC: 20504
|
||||||
## Interface-Wrath: 30400
|
## Interface-Wrath: 30401
|
||||||
## Title: IceHUD |cff7fff7f-Options-|r
|
## Title: IceHUD |cff7fff7f-Options-|r
|
||||||
## Author: Parnic
|
## Author: Parnic
|
||||||
## Version: @project-version@
|
## Version: @project-version@
|
||||||
|
@ -85,13 +85,13 @@ If you have |cff42ffffDogTags|r enabled, you can open the Text Settings for the
|
|||||||
This is a side effect of the animation API that I'm co-opting to force a rotation without having to provide duplicates of every bar texture in the mod. Any bar moving sufficiently quickly and updating rapidly will cause this. |cff9999ffIceHUD|r is intended to be a vertically-oriented mod, so the rotation feature is there for people who are willing to accept the side effects that come with it. My suggestion is to use one of the many horizontally-oriented bar mods out there if you're wanting horizontal bars. |cff42ffffQuartz|r is a good castbar replacement that you can use and disable |cff9999ffIceHUD|r's built-in castbar, for example.
|
This is a side effect of the animation API that I'm co-opting to force a rotation without having to provide duplicates of every bar texture in the mod. Any bar moving sufficiently quickly and updating rapidly will cause this. |cff9999ffIceHUD|r is intended to be a vertically-oriented mod, so the rotation feature is there for people who are willing to accept the side effects that come with it. My suggestion is to use one of the many horizontally-oriented bar mods out there if you're wanting horizontal bars. |cff42ffffQuartz|r is a good castbar replacement that you can use and disable |cff9999ffIceHUD|r's built-in castbar, for example.
|
||||||
|
|
||||||
|cff9999ff18. How do I get rid of the bars that showed up beneath the player in the 7.0 patch?|r
|
|cff9999ff18. How do I get rid of the bars that showed up beneath the player in the 7.0 patch?|r
|
||||||
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 -> |cffffdc42Interface|r -> |cffffdc42Names|r -> |cffffdc42Personal Resource Display|r (or Options -> |cffffdc42Combat|r -> |cffffdc42Personal Resource Display|r, in 10.0+).
|
||||||
|
|
||||||
|cff9999ff19. Why is there no target castbar for Classic?|r
|
|cff9999ff19. Why is there no target castbar for Classic?|r
|
||||||
The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. You can install the LibCasterCasterino addon to enable support, but it's a best guess and not at all accurate.
|
The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. You can install the |cff42ffffLibCasterCasterino|r addon to enable support, but it's a best guess and not at all accurate.
|
||||||
|
|
||||||
|cff9999ff20. Why do buff/debuff timers not work in Classic?|r
|
|cff9999ff20. Why do buff/debuff timers not work in Classic?|r
|
||||||
The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the LibClassicDurations addon to enable support, but it's a best guess and not at all accurate.]]
|
The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the |cff42ffffLibClassicDurations|r addon to enable support, but it's a best guess and not at all accurate.]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -426,6 +426,24 @@ The Classic game client doesn't provide this information to addons because it wa
|
|||||||
hidden = not IceHUD.HasShellGame,
|
hidden = not IceHUD.HasShellGame,
|
||||||
order = 36,
|
order = 36,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
bHideDuringCataloging = {
|
||||||
|
type = 'toggle',
|
||||||
|
name = L["Hide during cataloging"],
|
||||||
|
desc = L["This will hide the entire mod when using the Dragonflight Cataloging camera."],
|
||||||
|
width = 'double',
|
||||||
|
get = function()
|
||||||
|
return IceHUD.IceCore.settings.bHideDuringCataloging
|
||||||
|
end,
|
||||||
|
set = function(info, value)
|
||||||
|
IceHUD.IceCore.settings.bHideDuringCataloging = value
|
||||||
|
if not value then
|
||||||
|
IceHUD.IceCore.IceHUDFrame:Show()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
hidden = not IceHUD.HasCataloging,
|
||||||
|
order = 36,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -52,7 +52,13 @@ function IceStackCounter_GetOptions(frame, opts)
|
|||||||
opts["auraName"] = {
|
opts["auraName"] = {
|
||||||
type = 'input',
|
type = 'input',
|
||||||
name = L["Aura to track"],
|
name = L["Aura to track"],
|
||||||
desc = L["Which buff/debuff this counter will be tracking. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
|
desc = function()
|
||||||
|
if IceHUD.GetPlayerAuraBySpellID then
|
||||||
|
return L["Which buff/debuff this counter will be tracking. Can use the name or spell id. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
|
||||||
|
else
|
||||||
|
return L["Which buff/debuff this counter will be tracking. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
|
||||||
|
end
|
||||||
|
end,
|
||||||
get = function()
|
get = function()
|
||||||
return frame.moduleSettings.auraName
|
return frame.moduleSettings.auraName
|
||||||
end,
|
end,
|
||||||
|
@ -19,10 +19,11 @@ IceUnitBar.prototype.hasPet = nil
|
|||||||
|
|
||||||
IceUnitBar.prototype.noFlash = nil
|
IceUnitBar.prototype.noFlash = nil
|
||||||
|
|
||||||
local SPELL_POWER_INSANITY, SPELL_POWER_RAGE = SPELL_POWER_INSANITY, SPELL_POWER_RAGE
|
local SPELL_POWER_INSANITY, SPELL_POWER_RAGE, SPELL_POWER_RUNIC_POWER = SPELL_POWER_INSANITY, SPELL_POWER_RAGE, SPELL_POWER_RUNIC_POWER
|
||||||
if Enum and Enum.PowerType then
|
if Enum and Enum.PowerType then
|
||||||
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||||
|
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
@ -87,7 +88,7 @@ function IceUnitBar.prototype:GetOptions()
|
|||||||
self:Redraw()
|
self:Redraw()
|
||||||
end,
|
end,
|
||||||
disabled = function()
|
disabled = function()
|
||||||
return not self.moduleSettings.enabled or not self.moduleSettings.lowThresholdFlash
|
return not self.moduleSettings.enabled or not (self.moduleSettings.lowThresholdFlash or self.moduleSettings.lowThresholdColor)
|
||||||
end,
|
end,
|
||||||
min = 0,
|
min = 0,
|
||||||
max = 1,
|
max = 1,
|
||||||
@ -105,10 +106,14 @@ function IceUnitBar.prototype:GetOptions()
|
|||||||
end,
|
end,
|
||||||
set = function(info, v)
|
set = function(info, v)
|
||||||
self.moduleSettings.lowThresholdFlash = v
|
self.moduleSettings.lowThresholdFlash = v
|
||||||
|
self:Redraw()
|
||||||
end,
|
end,
|
||||||
disabled = function()
|
disabled = function()
|
||||||
return not self.moduleSettings.enabled
|
return not self.moduleSettings.enabled
|
||||||
end,
|
end,
|
||||||
|
hidden = function()
|
||||||
|
return self.noFlash
|
||||||
|
end,
|
||||||
order = 30.092
|
order = 30.092
|
||||||
}
|
}
|
||||||
opts["lowThresholdColor"] = {
|
opts["lowThresholdColor"] = {
|
||||||
@ -123,7 +128,7 @@ function IceUnitBar.prototype:GetOptions()
|
|||||||
self:Redraw()
|
self:Redraw()
|
||||||
end,
|
end,
|
||||||
disabled = function()
|
disabled = function()
|
||||||
return not self.moduleSettings.enabled or not (self.moduleSettings.scaleHealthColor and self.moduleSettings.scaleManaColor)
|
return not self.moduleSettings.enabled
|
||||||
end,
|
end,
|
||||||
order = 30.093
|
order = 30.093
|
||||||
}
|
}
|
||||||
@ -235,7 +240,9 @@ function IceUnitBar.prototype:Update()
|
|||||||
-- so this technically doesn't get us the answer we want most of the time. too risky to change at this point, though.
|
-- so this technically doesn't get us the answer we want most of the time. too risky to change at this point, though.
|
||||||
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 UnitPowerType(self.unit) == SPELL_POWER_RAGE and self.maxMana == 1000 then
|
local powerType = UnitPowerType(self.unit)
|
||||||
|
if (powerType == SPELL_POWER_RAGE and self.maxMana == 1000)
|
||||||
|
or (powerType == SPELL_POWER_RUNIC_POWER and self.maxMana >= 1000) then
|
||||||
self.mana = IceHUD:MathRound(self.mana / 10)
|
self.mana = IceHUD:MathRound(self.mana / 10)
|
||||||
self.maxMana = IceHUD:MathRound(self.maxMana / 10)
|
self.maxMana = IceHUD:MathRound(self.maxMana / 10)
|
||||||
end
|
end
|
||||||
@ -278,14 +285,14 @@ function IceUnitBar.prototype:Update()
|
|||||||
-- This looks slightly quirky. Basically the easiest way for me to achieve this is to have lowThresholdColor override
|
-- This looks slightly quirky. Basically the easiest way for me to achieve this is to have lowThresholdColor override
|
||||||
-- the scaled color. You'll need to switch them both on to get things to work.
|
-- the scaled color. You'll need to switch them both on to get things to work.
|
||||||
if( self.moduleSettings.lowThresholdColor ) then
|
if( self.moduleSettings.lowThresholdColor ) then
|
||||||
if( self.healthPercentage < self.moduleSettings.lowThreshold ) then
|
if( self.healthPercentage <= self.moduleSettings.lowThreshold ) then
|
||||||
self.settings.colors[ "ScaledHealthColor" ] = self.settings.colors[ "MinHealthColor" ]
|
self.settings.colors[ "ScaledHealthColor" ] = self.settings.colors[ "MinHealthColor" ]
|
||||||
else
|
elseif not self.moduleSettings.scaleHealthColor then
|
||||||
self.settings.colors[ "ScaledHealthColor" ] = self.settings.colors[ "MaxHealthColor" ]
|
self.settings.colors[ "ScaledHealthColor" ] = self.settings.colors[ "MaxHealthColor" ]
|
||||||
end
|
end
|
||||||
if( self.manaPercentage < self.moduleSettings.lowThreshold ) then
|
if( self.manaPercentage <= self.moduleSettings.lowThreshold ) then
|
||||||
self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MinManaColor" ]
|
self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MinManaColor" ]
|
||||||
else
|
elseif not self.moduleSettings.scaleManaColor then
|
||||||
self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MaxManaColor" ]
|
self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MaxManaColor" ]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
2
LICENSE
2
LICENSE
@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2021 parnic
|
Copyright (c) 2021-2022 parnic
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
89
changelog.md
89
changelog.md
@ -1,5 +1,94 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
v1.14.18:
|
||||||
|
|
||||||
|
- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
|
||||||
|
- Added option (enabled by default) to hide mod during cataloging.
|
||||||
|
- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
|
||||||
|
- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
|
||||||
|
|
||||||
|
v1.14.17:
|
||||||
|
|
||||||
|
- Updated TOCs for 10.0.7
|
||||||
|
|
||||||
|
v1.14.16:
|
||||||
|
|
||||||
|
- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
|
||||||
|
- Fixed a reported error when playing Darkmoon Faire games.
|
||||||
|
- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
|
||||||
|
|
||||||
|
v1.14.15:
|
||||||
|
|
||||||
|
- Updated TOCs for 10.0.5
|
||||||
|
|
||||||
|
v1.14.14:
|
||||||
|
|
||||||
|
- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
|
||||||
|
|
||||||
|
v1.14.13:
|
||||||
|
|
||||||
|
- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)
|
||||||
|
|
||||||
|
v1.14.12:
|
||||||
|
|
||||||
|
- Added a module for showing Dragonriding Vigor points.
|
||||||
|
|
||||||
|
v1.14.11:
|
||||||
|
|
||||||
|
- Packaged a new version of LibDogTag-Unit to fix the Guild roster resetting its scroll position every 20 seconds.
|
||||||
|
|
||||||
|
v1.14.10:
|
||||||
|
|
||||||
|
- Fix an error in TargetTargetHealth/Mana and CustomHealth when Low Threshold Color was checked and Scale by Health % was un-checked.
|
||||||
|
|
||||||
|
v1.14.9:
|
||||||
|
|
||||||
|
- Fix Low Threshold to be usable even when Color By Health/Mana % is disabled. (ticket #334)
|
||||||
|
|
||||||
|
v1.14.8:
|
||||||
|
|
||||||
|
- Fix Color By Health % to work with Low Threshold Color option. Previously, if Low Threshold was set, the color was always either MaxHealth/MaxMana or MinHealth/MinMana, it would never be colored by health %. Now if both are set, it will scale by health % until it reaches the low threshold, at which point it will switch to the Min color.
|
||||||
|
- Fix Low Threshold color and flashing to work at the same percentage. Previously these were slightly different such that it would start flashing at 40% but not turn to the Min color until 39.9999%, for example.
|
||||||
|
|
||||||
|
v1.14.7:
|
||||||
|
|
||||||
|
- Add option to scale absorb bar by the unit's maximum health.
|
||||||
|
|
||||||
|
v1.14.6:
|
||||||
|
|
||||||
|
- Add ability for buff/debuff watchers to only display when the specified buff/debuff is missing. This also adds the ability to require that the given unit exists. So if you had Unit set to Target, Display mode set to Missing, and Only if unit exists checked, you'd show the bar if you have a target and they don't have the given buff/debuff.
|
||||||
|
- Don't flash the castbar for instant-cast spells that the player didn't cast (such as internal quest spells).
|
||||||
|
- Add DruidEnergy module (disabled by default). This module will show the player's Energy level if they're a Druid and currently shapeshifted to a non-energy-using form (eligible forms are configurable by the user).
|
||||||
|
|
||||||
|
v1.14.5:
|
||||||
|
|
||||||
|
- Fix castbar flashing. There are controls on the player castbar module for flashing when a spell succeeds or fails, and separate controls for flashing when an instant cast completes. Those were broken, but now work again.
|
||||||
|
- Add "@" after the number when the Combo Points module is in Numeric mode, "Show Charged points" is enabled, and the current combo point is charged.
|
||||||
|
- Fix Charged point support in the ComboPointsBar module.
|
||||||
|
|
||||||
|
v1.14.4:
|
||||||
|
|
||||||
|
- Update TOC for 10.0.2
|
||||||
|
|
||||||
|
v1.14.3:
|
||||||
|
|
||||||
|
- Add Spell ID support for aura tracking.
|
||||||
|
- Add Evoker support.
|
||||||
|
- Add Empowered Casting (hold-to-cast levels) support.
|
||||||
|
|
||||||
|
v1.14.2:
|
||||||
|
|
||||||
|
- Fix CC and Invuln modules not showing immediately when they should.
|
||||||
|
|
||||||
|
v1.14.1:
|
||||||
|
|
||||||
|
- Fix Hide Party feature on pre-10.0 clients.
|
||||||
|
|
||||||
|
v1.14.0:
|
||||||
|
|
||||||
|
- 10.0 compatibility
|
||||||
|
- Renamed Anima Charged combo points to Charged, and removed specific references to Kyrian.
|
||||||
|
|
||||||
v1.13.17.3:
|
v1.13.17.3:
|
||||||
|
|
||||||
- Packaged latest LibDogTag-Unit to work around crash in Wrath Classic client.
|
- Packaged latest LibDogTag-Unit to work around crash in Wrath Classic client.
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
<Include file="libs\AceConsole-3.0\AceConsole-3.0.xml"/>
|
<Include file="libs\AceConsole-3.0\AceConsole-3.0.xml"/>
|
||||||
<Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>
|
<Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>
|
||||||
<Include file="libs\AceLocale-3.0\AceLocale-3.0.xml"/>
|
<Include file="libs\AceLocale-3.0\AceLocale-3.0.xml"/>
|
||||||
|
<Include file="libs\AceHook-3.0\AceHook-3.0.xml"/>
|
||||||
<Include file="libs\LibDogTag-3.0\lib.xml"/>
|
<Include file="libs\LibDogTag-3.0\lib.xml"/>
|
||||||
<Include file="libs\LibDogTag-Unit-3.0\lib.xml"/>
|
<Include file="libs\LibDogTag-Unit-3.0\lib.xml"/>
|
||||||
<Script file="libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
|
<Script file="libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
|
||||||
|
@ -39,6 +39,9 @@ function CastBar.prototype:GetDefaultSettings()
|
|||||||
settings["rangeColor"] = true
|
settings["rangeColor"] = true
|
||||||
settings["bAllowExpand"] = false
|
settings["bAllowExpand"] = false
|
||||||
settings["respectLagTolerance"] = true
|
settings["respectLagTolerance"] = true
|
||||||
|
settings["lockUpperTextAlpha"] = true
|
||||||
|
settings["lockLowerTextAlpha"] = true
|
||||||
|
settings["empowerStageTextDisplay"] = "TOPLINE"
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
@ -236,6 +239,7 @@ function CastBar.prototype:GetOptions()
|
|||||||
end,
|
end,
|
||||||
set = function(info, v)
|
set = function(info, v)
|
||||||
self.moduleSettings.lockUpperTextAlpha = v
|
self.moduleSettings.lockUpperTextAlpha = v
|
||||||
|
self.moduleSettings.lockLowerTextAlpha = v
|
||||||
self:Redraw()
|
self:Redraw()
|
||||||
end,
|
end,
|
||||||
order = 13
|
order = 13
|
||||||
@ -308,7 +312,26 @@ function CastBar.prototype:GetOptions()
|
|||||||
disabled = function()
|
disabled = function()
|
||||||
return not self.moduleSettings.enabled
|
return not self.moduleSettings.enabled
|
||||||
end,
|
end,
|
||||||
}
|
},
|
||||||
|
|
||||||
|
empowerStageText = {
|
||||||
|
type = 'select',
|
||||||
|
name = L["Empower stage label display"],
|
||||||
|
desc = L["How to display the stage of an empowered spell"],
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.empowerStageTextDisplay
|
||||||
|
end,
|
||||||
|
set = function(info, value)
|
||||||
|
self.moduleSettings.empowerStageTextDisplay = value
|
||||||
|
end,
|
||||||
|
values = { NONE = L["Don't show"], TOPLINE = L["After spell name"], BOTTOMLINE = L["Below spell name"] },
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
hidden = function()
|
||||||
|
return not GetUnitEmpowerMinHoldTime
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,8 @@ IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
|
|||||||
IceClassPowerCounter.prototype.unit = "player"
|
IceClassPowerCounter.prototype.unit = "player"
|
||||||
IceClassPowerCounter.prototype.round = ceil
|
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 = IceClassPowerCounter.prototype.growModes["height"]
|
||||||
|
IceClassPowerCounter.prototype.shouldRegisterDisplayPower = true
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function IceClassPowerCounter.prototype:init(name)
|
function IceClassPowerCounter.prototype:init(name)
|
||||||
@ -391,7 +392,7 @@ function IceClassPowerCounter.prototype:GetDefaultSettings()
|
|||||||
defaults["hideFriendly"] = false
|
defaults["hideFriendly"] = false
|
||||||
defaults["pulseWhenFull"] = true
|
defaults["pulseWhenFull"] = true
|
||||||
defaults["overrideAlpha"] = true
|
defaults["overrideAlpha"] = true
|
||||||
defaults["numericVerticalOffset"] = 0
|
defaults["numericVerticalOffset"] = -25
|
||||||
defaults["alwaysShowNumeric"] = false
|
defaults["alwaysShowNumeric"] = false
|
||||||
|
|
||||||
return defaults
|
return defaults
|
||||||
@ -462,11 +463,17 @@ function IceClassPowerCounter.prototype:CheckValidSpec()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceClassPowerCounter.prototype:GetPowerEvent()
|
||||||
|
return IceHUD.UnitPowerEvent
|
||||||
|
end
|
||||||
|
|
||||||
function IceClassPowerCounter.prototype:DisplayCounter()
|
function IceClassPowerCounter.prototype:DisplayCounter()
|
||||||
self:UnregisterEvent("PLAYER_LEVEL_UP")
|
self:UnregisterEvent("PLAYER_LEVEL_UP")
|
||||||
|
|
||||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateRunePower")
|
self:RegisterEvent(self:GetPowerEvent(), "UpdateRunePower")
|
||||||
self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
|
if self.shouldRegisterDisplayPower then
|
||||||
|
self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
|
||||||
|
end
|
||||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||||
if IceHUD.EventExistsUnitMaxPower then
|
if IceHUD.EventExistsUnitMaxPower then
|
||||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateRunePower")
|
self:RegisterEvent("UNIT_MAXPOWER", "UpdateRunePower")
|
||||||
@ -493,7 +500,7 @@ function IceClassPowerCounter.prototype:EnteringWorld()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||||
if event and (event == IceHUD.UnitPowerEvent or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
|
if event and (event == self:GetPowerEvent() or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -523,10 +530,15 @@ 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
|
||||||
|
local displayPercent = percentReady
|
||||||
|
if self.partialReadyPercent then
|
||||||
|
displayPercent = percentReady + self.partialReadyPercent
|
||||||
|
end
|
||||||
|
|
||||||
if self.numericFormat then
|
if self.numericFormat then
|
||||||
self.frame.numeric:SetText(format(self.numericFormat, percentReady))
|
self.frame.numeric:SetText(format(self.numericFormat, displayPercent))
|
||||||
else
|
else
|
||||||
self.frame.numeric:SetText(tostring(percentReady))
|
self.frame.numeric:SetText(tostring(displayPercent))
|
||||||
end
|
end
|
||||||
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
||||||
end
|
end
|
||||||
@ -535,7 +547,7 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
|||||||
for i=1, self.numRunes do
|
for i=1, self.numRunes do
|
||||||
if i <= self.round(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:SetRuneGraphicalTexture(i)
|
||||||
else
|
else
|
||||||
self:SetCustomColor(i)
|
self:SetCustomColor(i)
|
||||||
end
|
end
|
||||||
@ -545,33 +557,14 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if i > numReady or self.numRunes == 1 then
|
if i > numReady or self.numRunes == 1 then
|
||||||
local left, right, top, bottom = 0, 1, 0, 1
|
|
||||||
if self:GetRuneMode() == "Graphical" then
|
|
||||||
left, right, top, bottom = unpack(self.runeCoords[i])
|
|
||||||
end
|
|
||||||
|
|
||||||
local currPercent = percentReady - numReady
|
local currPercent = percentReady - numReady
|
||||||
if self.numRunes == 1 then
|
if self.numRunes == 1 then
|
||||||
currPercent = numReady / UnitPowerMax("player", self.unitPower)
|
currPercent = numReady / UnitPowerMax("player", self.unitPower)
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.currentGrowMode == self.growModes["height"] then
|
self:SetRuneCoords(i, currPercent)
|
||||||
top = bottom - (currPercent * (bottom - top))
|
|
||||||
self.frame.graphical[i].rune:SetHeight(currPercent * self.runeHeight)
|
|
||||||
elseif self.currentGrowMode == self.growModes["width"] then
|
|
||||||
right = left + (currPercent * (right - left))
|
|
||||||
self.frame.graphical[i].rune:SetWidth(currPercent * self.runeWidth)
|
|
||||||
end
|
|
||||||
self.frame.graphical[i].rune:SetTexCoord(left, right, top, bottom)
|
|
||||||
elseif i > self.lastNumReady then
|
elseif i > self.lastNumReady then
|
||||||
if self.runeCoords ~= nil and #self.runeCoords >= i then
|
self:SetRuneCoords(i, 1)
|
||||||
local left, right, top, bottom = 0, 1, 0, 1
|
|
||||||
if self:GetRuneMode() == "Graphical" then
|
|
||||||
left, right, top, bottom = unpack(self.runeCoords[i])
|
|
||||||
end
|
|
||||||
self.frame.graphical[i].rune:SetTexCoord(left, right, top, bottom)
|
|
||||||
self.frame.graphical[i].rune:SetHeight(self.runeHeight)
|
|
||||||
end
|
|
||||||
|
|
||||||
if self.moduleSettings.flashWhenBecomingReady then
|
if self.moduleSettings.flashWhenBecomingReady then
|
||||||
local fadeInfo={
|
local fadeInfo={
|
||||||
@ -584,6 +577,17 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
if self.partialReady then
|
||||||
|
if i == self.partialReady then
|
||||||
|
self:SetRuneCoords(i, self.partialReadyPercent)
|
||||||
|
if self:GetRuneMode() == "Graphical" then
|
||||||
|
self:SetRuneGraphicalTexture(i, true)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
self:SetRuneCoords(i, 0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
self:HideRune(i)
|
self:HideRune(i)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -605,6 +609,30 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceClassPowerCounter.prototype:SetRuneCoords(rune, percent)
|
||||||
|
if self.runeCoords == nil or #self.runeCoords < rune then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local left, right, top, bottom = 0, 1, 0, 1
|
||||||
|
if self:GetRuneMode() == "Graphical" then
|
||||||
|
local coords = self.runeCoords[rune]
|
||||||
|
if coords then
|
||||||
|
left, right, top, bottom = unpack(coords)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if self.currentGrowMode == self.growModes["height"] then
|
||||||
|
top = bottom - (percent * (bottom - top))
|
||||||
|
self.frame.graphical[rune].rune:SetHeight(percent * self.runeHeight)
|
||||||
|
elseif self.currentGrowMode == self.growModes["width"] then
|
||||||
|
right = left + (percent * (right - left))
|
||||||
|
self.frame.graphical[rune].rune:SetWidth(percent * self.runeWidth)
|
||||||
|
end
|
||||||
|
|
||||||
|
self.frame.graphical[rune].rune:SetTexCoord(left, right, top, bottom)
|
||||||
|
end
|
||||||
|
|
||||||
function IceClassPowerCounter.prototype:HideRune(i)
|
function IceClassPowerCounter.prototype:HideRune(i)
|
||||||
if self:GetRuneMode() == "Numeric" then
|
if self:GetRuneMode() == "Numeric" then
|
||||||
self.frame.graphical[i].Hide()
|
self.frame.graphical[i].Hide()
|
||||||
@ -688,6 +716,18 @@ function IceClassPowerCounter.prototype:GetShineAtlas(rune)
|
|||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceClassPowerCounter.prototype:GetFrameAtlas(rune)
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
function IceClassPowerCounter.prototype:GetBackgroundAtlas(rune)
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
function IceClassPowerCounter.prototype:GetPartialRuneAtlas(rune)
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
function IceClassPowerCounter.prototype:CreateFrame()
|
function IceClassPowerCounter.prototype:CreateFrame()
|
||||||
IceClassPowerCounter.super.prototype.CreateFrame(self)
|
IceClassPowerCounter.super.prototype.CreateFrame(self)
|
||||||
|
|
||||||
@ -708,6 +748,7 @@ end
|
|||||||
function IceClassPowerCounter.prototype:SetDisplayMode()
|
function IceClassPowerCounter.prototype:SetDisplayMode()
|
||||||
if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
|
if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
|
||||||
self.frame.numeric:Show()
|
self.frame.numeric:Show()
|
||||||
|
self.frame.numeric:SetPoint("CENTER", self.frame.numericParent, "CENTER", 0, self.moduleSettings.runeMode == "Numeric" and 0 or self.moduleSettings.numericVerticalOffset)
|
||||||
for i=1, self.numRunes do
|
for i=1, self.numRunes do
|
||||||
self.frame.graphical[i]:Hide()
|
self.frame.graphical[i]:Hide()
|
||||||
end
|
end
|
||||||
@ -719,6 +760,21 @@ function IceClassPowerCounter.prototype:SetDisplayMode()
|
|||||||
for i=1, self.numRunes do
|
for i=1, self.numRunes do
|
||||||
self:SetupRuneTexture(i)
|
self:SetupRuneTexture(i)
|
||||||
self.frame.graphical[i]:Show()
|
self.frame.graphical[i]:Show()
|
||||||
|
|
||||||
|
if self.frame.graphical[i].frame then
|
||||||
|
if self:GetRuneMode() == "Graphical" then
|
||||||
|
self.frame.graphical[i].frame:Show()
|
||||||
|
else
|
||||||
|
self.frame.graphical[i].frame:Hide()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if self.frame.graphical[i].bg then
|
||||||
|
if self:GetRuneMode() == "Graphical" then
|
||||||
|
self.frame.graphical[i].bg:Show()
|
||||||
|
else
|
||||||
|
self.frame.graphical[i].bg:Hide()
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -733,7 +789,6 @@ function IceClassPowerCounter.prototype:CreateRuneFrame()
|
|||||||
|
|
||||||
self.frame.numeric:SetJustifyH("CENTER")
|
self.frame.numeric:SetJustifyH("CENTER")
|
||||||
|
|
||||||
self.frame.numeric:SetPoint("CENTER", self.frame.numericParent, "CENTER", 0, self.moduleSettings.numericVerticalOffset)
|
|
||||||
self.frame.numeric:Hide()
|
self.frame.numeric:Hide()
|
||||||
|
|
||||||
if (not self.frame.graphical) then
|
if (not self.frame.graphical) then
|
||||||
@ -754,7 +809,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
|||||||
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
|
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
|
||||||
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
|
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
|
||||||
|
|
||||||
self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "ARTWORK")
|
self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "BORDER")
|
||||||
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
|
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
|
||||||
self:SetupRuneTexture(i)
|
self:SetupRuneTexture(i)
|
||||||
|
|
||||||
@ -763,7 +818,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
|||||||
self.frame.graphical[i].shine:SetAtlas(self:GetShineAtlas(i))
|
self.frame.graphical[i].shine:SetAtlas(self:GetShineAtlas(i))
|
||||||
else
|
else
|
||||||
self.frame.graphical[i].shine:SetTexture("Interface\\ComboFrame\\ComboPoint")
|
self.frame.graphical[i].shine:SetTexture("Interface\\ComboFrame\\ComboPoint")
|
||||||
self.frame.graphical[i].shine:SetTexCoord(0.5625, 1, 0, 1)
|
self.frame.graphical[i].shine:SetTexCoord(0.5625, 1, 0, 1)
|
||||||
end
|
end
|
||||||
self.frame.graphical[i].shine:SetBlendMode("ADD")
|
self.frame.graphical[i].shine:SetBlendMode("ADD")
|
||||||
self.frame.graphical[i].shine:ClearAllPoints()
|
self.frame.graphical[i].shine:ClearAllPoints()
|
||||||
@ -773,6 +828,22 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
|||||||
self.frame.graphical[i].shine:SetHeight(self.runeHeight + 10)
|
self.frame.graphical[i].shine:SetHeight(self.runeHeight + 10)
|
||||||
self.frame.graphical[i].shine:Hide()
|
self.frame.graphical[i].shine:Hide()
|
||||||
|
|
||||||
|
local frameAtlas = self:GetFrameAtlas(i)
|
||||||
|
if frameAtlas then
|
||||||
|
self.frame.graphical[i].frame = self.frame.graphical[i]:CreateTexture(nil, "ARTWORK")
|
||||||
|
self.frame.graphical[i].frame:SetAtlas(frameAtlas)
|
||||||
|
self.frame.graphical[i].frame:ClearAllPoints()
|
||||||
|
self.frame.graphical[i].frame:SetPoint("CENTER", self.frame.graphical[i], "CENTER")
|
||||||
|
end
|
||||||
|
|
||||||
|
local bgAtlas = self:GetBackgroundAtlas(i)
|
||||||
|
if bgAtlas then
|
||||||
|
self.frame.graphical[i].bg = self.frame.graphical[i]:CreateTexture(nil, "BACKGROUND")
|
||||||
|
self.frame.graphical[i].bg:SetAtlas(bgAtlas)
|
||||||
|
self.frame.graphical[i].bg:ClearAllPoints()
|
||||||
|
self.frame.graphical[i].bg:SetAllPoints(self.frame.graphical[i])
|
||||||
|
end
|
||||||
|
|
||||||
self.frame.graphical[i]:Hide()
|
self.frame.graphical[i]:Hide()
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -780,6 +851,10 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
|||||||
self.frame.graphical[i]:SetHeight(self.runeHeight)
|
self.frame.graphical[i]:SetHeight(self.runeHeight)
|
||||||
self.frame.graphical[i].rune:SetWidth(self.runeWidth)
|
self.frame.graphical[i].rune:SetWidth(self.runeWidth)
|
||||||
self.frame.graphical[i].rune:SetHeight(self.runeHeight)
|
self.frame.graphical[i].rune:SetHeight(self.runeHeight)
|
||||||
|
if self.frame.graphical[i].frame then
|
||||||
|
self.frame.graphical[i].frame:SetWidth(self.runeWidth + 10)
|
||||||
|
self.frame.graphical[i].frame:SetHeight(self.runeHeight + 10)
|
||||||
|
end
|
||||||
if self.currentGrowMode == self.growModes["width"] then
|
if self.currentGrowMode == self.growModes["width"] then
|
||||||
self.frame.graphical[i].rune:SetPoint("LEFT", self.frame.graphical[i], "LEFT")
|
self.frame.graphical[i].rune:SetPoint("LEFT", self.frame.graphical[i], "LEFT")
|
||||||
else
|
else
|
||||||
@ -802,7 +877,10 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
|
|||||||
local a,b,c,d = 0, 1, 0, 1
|
local a,b,c,d = 0, 1, 0, 1
|
||||||
if self:GetRuneMode() == "Graphical" then
|
if self:GetRuneMode() == "Graphical" then
|
||||||
width = self.runeWidth
|
width = self.runeWidth
|
||||||
a,b,c,d = unpack(self.runeCoords[rune])
|
local coords = self.runeCoords[rune]
|
||||||
|
if coords then
|
||||||
|
a,b,c,d = unpack(coords)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- make sure any texture aside from the special one is square and has the proper coordinates
|
-- make sure any texture aside from the special one is square and has the proper coordinates
|
||||||
@ -817,12 +895,7 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if self:GetRuneMode() == "Graphical" then
|
if self:GetRuneMode() == "Graphical" then
|
||||||
local tex = self:GetRuneTexture(rune)
|
self:SetRuneGraphicalTexture(rune)
|
||||||
if tex then
|
|
||||||
self.frame.graphical[rune].rune:SetTexture(tex)
|
|
||||||
else
|
|
||||||
self.frame.graphical[rune].rune:SetAtlas(self:GetRuneAtlas(rune), self:UseAtlasSize(rune))
|
|
||||||
end
|
|
||||||
elseif self:GetRuneMode() == "Graphical Bar" then
|
elseif self:GetRuneMode() == "Graphical Bar" then
|
||||||
self.frame.graphical[rune].rune:SetTexture(IceElement.TexturePath .. "Combo")
|
self.frame.graphical[rune].rune:SetTexture(IceElement.TexturePath .. "Combo")
|
||||||
elseif self:GetRuneMode() == "Graphical Circle" then
|
elseif self:GetRuneMode() == "Graphical Circle" then
|
||||||
@ -834,6 +907,19 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceClassPowerCounter.prototype:SetRuneGraphicalTexture(rune, partial)
|
||||||
|
self.frame.graphical[rune].rune:SetVertexColor(1, 1, 1)
|
||||||
|
|
||||||
|
local tex = self:GetRuneTexture(rune)
|
||||||
|
if tex then
|
||||||
|
self.frame.graphical[rune].rune:SetTexture(tex)
|
||||||
|
else
|
||||||
|
local partialAtlas = self:GetPartialRuneAtlas(rune)
|
||||||
|
local atlas = (partial and partialAtlas) and partialAtlas or self:GetRuneAtlas(rune)
|
||||||
|
self.frame.graphical[rune].rune:SetAtlas(atlas, self:UseAtlasSize(rune))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function IceClassPowerCounter.prototype:GetAlphaAdd()
|
function IceClassPowerCounter.prototype:GetAlphaAdd()
|
||||||
return 0.15
|
return 0.15
|
||||||
end
|
end
|
||||||
|
@ -545,6 +545,9 @@ function ComboPoints.prototype:UpdateComboPoints(...)
|
|||||||
self.frame.numeric:SetTextColor(r, g, b, 0.7)
|
self.frame.numeric:SetTextColor(r, g, b, 0.7)
|
||||||
|
|
||||||
local pointsText = tostring(points)
|
local pointsText = tostring(points)
|
||||||
|
if self.moduleSettings.bShowCharged and self:IsChargedPoint(points) then
|
||||||
|
pointsText = pointsText.."@"
|
||||||
|
end
|
||||||
if anticipate > 0 then
|
if anticipate > 0 then
|
||||||
pointsText = pointsText.."+"..tostring(anticipate)
|
pointsText = pointsText.."+"..tostring(anticipate)
|
||||||
end
|
end
|
||||||
|
@ -11,6 +11,7 @@ function ComboPointsBar.prototype:init()
|
|||||||
|
|
||||||
self:SetDefaultColor("ComboPointsBarMin", 1, 1, 0)
|
self:SetDefaultColor("ComboPointsBarMin", 1, 1, 0)
|
||||||
self:SetDefaultColor("ComboPointsBarMax", 0, 1, 0)
|
self:SetDefaultColor("ComboPointsBarMax", 0, 1, 0)
|
||||||
|
self:SetDefaultColor("ChargedComboPointBar", 0.3137254901960784, 0.3725490196078432, 1)
|
||||||
|
|
||||||
self.bTreatEmptyAsFull = true
|
self.bTreatEmptyAsFull = true
|
||||||
end
|
end
|
||||||
@ -52,6 +53,26 @@ function ComboPointsBar.prototype:GetOptions()
|
|||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opts["bShowCharged"] = {
|
||||||
|
type = 'toggle',
|
||||||
|
width = 'double',
|
||||||
|
name = L["Show Charged points"],
|
||||||
|
desc = L["Whether or not to color a charged combo point a separate color and append an @ sign to the number. Set the ChargedComboPointBar color to the color you would like it to be."],
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.bShowCharged
|
||||||
|
end,
|
||||||
|
set = function(info, v)
|
||||||
|
self.moduleSettings.bShowCharged = v
|
||||||
|
self:UpdateComboPoints()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
hidden = function()
|
||||||
|
return not GetUnitChargedPowerPoints
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
return opts
|
return opts
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -62,6 +83,7 @@ function ComboPointsBar.prototype:GetDefaultSettings()
|
|||||||
defaults.alwaysDisplay = false
|
defaults.alwaysDisplay = false
|
||||||
defaults.desiredLerpTime = 0.05
|
defaults.desiredLerpTime = 0.05
|
||||||
defaults.bShowWithNoTarget = true
|
defaults.bShowWithNoTarget = true
|
||||||
|
defaults.bShowCharged = true
|
||||||
return defaults
|
return defaults
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -84,17 +106,7 @@ function ComboPointsBar.prototype:Enable(core)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if GetUnitChargedPowerPoints then
|
if GetUnitChargedPowerPoints then
|
||||||
self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
|
self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateComboPoints")
|
||||||
end
|
|
||||||
|
|
||||||
self:UpdateChargedComboPoints()
|
|
||||||
end
|
|
||||||
|
|
||||||
function ComboPointsBar.prototype:UpdateChargedComboPoints()
|
|
||||||
if GetUnitChargedPowerPoints then
|
|
||||||
local chargedPowerPoints = GetUnitChargedPowerPoints("player")
|
|
||||||
self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
|
|
||||||
self:UpdateComboPoints()
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -131,20 +143,46 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
|
|||||||
points = nil
|
points = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local isCharged = self:IsChargedPoint(points) and self.moduleSettings.bShowCharged
|
||||||
|
|
||||||
if points == nil or points == 0 or (not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget) then
|
if points == nil or points == 0 or (not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget) then
|
||||||
self:Show(self.moduleSettings.alwaysDisplay)
|
self:Show(self.moduleSettings.alwaysDisplay)
|
||||||
self:UpdateBar(0, "undef")
|
self:UpdateBar(0, "undef")
|
||||||
else
|
else
|
||||||
self:Show(true)
|
self:Show(true)
|
||||||
self:SetScaledColor(color, (points - 1) / 4.0, self.settings.colors["ComboPointsBarMax"], self.settings.colors["ComboPointsBarMin"])
|
if isCharged then
|
||||||
|
color.r, color.g, color.b = self:GetColor("ChargedComboPointBar")
|
||||||
|
else
|
||||||
|
self:SetScaledColor(color, (points - 1) / 4.0, self.settings.colors["ComboPointsBarMax"], self.settings.colors["ComboPointsBarMin"])
|
||||||
|
end
|
||||||
self:UpdateBar(points / UnitPowerMax("player", SPELL_POWER_COMBO_POINTS), "undef")
|
self:UpdateBar(points / UnitPowerMax("player", SPELL_POWER_COMBO_POINTS), "undef")
|
||||||
self.barFrame.bar:SetVertexColor(color.r, color.g, color.b, self.alpha)
|
self.barFrame.bar:SetVertexColor(color.r, color.g, color.b, self.alpha)
|
||||||
end
|
end
|
||||||
|
|
||||||
self:SetBottomText1(points or "0")
|
local pointsText = tostring(points or 0)
|
||||||
if self.chargedPowerPointIndex then
|
if isCharged then
|
||||||
self:SetBottomText2(self.chargedPowerPointIndex)
|
pointsText = pointsText .. "@"
|
||||||
end
|
end
|
||||||
|
self:SetBottomText1(pointsText or "0")
|
||||||
|
end
|
||||||
|
|
||||||
|
function ComboPointsBar.prototype:IsChargedPoint(point)
|
||||||
|
if not GetUnitChargedPowerPoints or not point then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
local chargedPoints = GetUnitChargedPowerPoints("player")
|
||||||
|
if not chargedPoints then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
for i=1, #chargedPoints do
|
||||||
|
if chargedPoints[i] == point then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
function ComboPointsBar.prototype:Update()
|
function ComboPointsBar.prototype:Update()
|
||||||
|
@ -10,6 +10,7 @@ local buffOrDebuff = {"buff", "debuff"}
|
|||||||
local validBuffTimers = {"none", "seconds", "minutes:seconds", "minutes"}
|
local validBuffTimers = {"none", "seconds", "minutes:seconds", "minutes"}
|
||||||
local AuraIconWidth = 20
|
local AuraIconWidth = 20
|
||||||
local AuraIconHeight = 20
|
local AuraIconHeight = 20
|
||||||
|
local displayModes = {NORMAL = L["When present"], ALWAYS = L["Always"], WHEN_TARGETING = L["Always, when targeting"], MISSING = L["When missing"]}
|
||||||
|
|
||||||
IceCustomBar.prototype.auraDuration = -1
|
IceCustomBar.prototype.auraDuration = -1
|
||||||
IceCustomBar.prototype.auraEndTime = -1
|
IceCustomBar.prototype.auraEndTime = -1
|
||||||
@ -28,6 +29,16 @@ end
|
|||||||
function IceCustomBar.prototype:Enable(core)
|
function IceCustomBar.prototype:Enable(core)
|
||||||
IceCustomBar.super.prototype.Enable(self, core)
|
IceCustomBar.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
|
-- fix up for new display mode setting
|
||||||
|
if self.moduleSettings.displayWhenTargeting then
|
||||||
|
self.moduleSettings.displayMode = displayModes.WHEN_TARGETING
|
||||||
|
self.moduleSettings.displayWhenTargeting = nil
|
||||||
|
end
|
||||||
|
if self.moduleSettings.displayWhenEmpty then
|
||||||
|
self.moduleSettings.displayMode = displayModes.ALWAYS
|
||||||
|
self.moduleSettings.displayWhenEmpty = nil
|
||||||
|
end
|
||||||
|
|
||||||
if IceHUD.IceCore:ShouldUseDogTags() then
|
if IceHUD.IceCore:ShouldUseDogTags() then
|
||||||
DogTag = LibStub("LibDogTag-3.0", true)
|
DogTag = LibStub("LibDogTag-3.0", true)
|
||||||
if DogTag then
|
if DogTag then
|
||||||
@ -149,8 +160,7 @@ function IceCustomBar.prototype:GetDefaultSettings()
|
|||||||
settings["buffOrDebuff"] = "buff"
|
settings["buffOrDebuff"] = "buff"
|
||||||
settings["barColor"] = {r=1, g=0, b=0, a=1}
|
settings["barColor"] = {r=1, g=0, b=0, a=1}
|
||||||
settings["trackOnlyMine"] = true
|
settings["trackOnlyMine"] = true
|
||||||
settings["displayWhenEmpty"] = false
|
settings["displayMode"] = displayModes.NORMAL
|
||||||
settings["displayWhenTargeting"] = false
|
|
||||||
settings["hideAnimationSettings"] = true
|
settings["hideAnimationSettings"] = true
|
||||||
settings["buffTimerDisplay"] = "minutes"
|
settings["buffTimerDisplay"] = "minutes"
|
||||||
settings["maxDuration"] = 0
|
settings["maxDuration"] = 0
|
||||||
@ -329,16 +339,18 @@ function IceCustomBar.prototype:GetOptions()
|
|||||||
opts["buffToTrack"] = {
|
opts["buffToTrack"] = {
|
||||||
type = 'input',
|
type = 'input',
|
||||||
name = L["Aura to track"],
|
name = L["Aura to track"],
|
||||||
desc = L["Which buff/debuff this bar will be tracking.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
|
desc = function()
|
||||||
|
if IceHUD.GetPlayerAuraBySpellID then
|
||||||
|
return L["Which buff/debuff this bar will be tracking. Can use the name or spell id. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
|
||||||
|
else
|
||||||
|
return L["Which buff/debuff this bar will be tracking.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
|
||||||
|
end
|
||||||
|
end,
|
||||||
get = function()
|
get = function()
|
||||||
return self.moduleSettings.buffToTrack
|
return self.moduleSettings.buffToTrack
|
||||||
end,
|
end,
|
||||||
set = function(info, v)
|
set = function(info, v)
|
||||||
local orig = v
|
local orig = v
|
||||||
--Parnic: we now allow spell IDs to be used directly
|
|
||||||
--if tonumber(v) ~= nil then
|
|
||||||
-- v = GetSpellInfo(tonumber(v))
|
|
||||||
--end
|
|
||||||
if v == nil then
|
if v == nil then
|
||||||
v = orig
|
v = orig
|
||||||
end
|
end
|
||||||
@ -429,38 +441,39 @@ function IceCustomBar.prototype:GetOptions()
|
|||||||
order = 30.8,
|
order = 30.8,
|
||||||
}
|
}
|
||||||
|
|
||||||
opts["displayWhenEmpty"] = {
|
opts["displayMode"] = {
|
||||||
type = 'toggle',
|
type = 'select',
|
||||||
name = L["Display when empty"],
|
values = displayModes,
|
||||||
desc = L["Whether or not to display this bar even if the buff/debuff specified is not present."],
|
name = L["Display mode"],
|
||||||
get = function()
|
desc = L["When to show the bar"],
|
||||||
return self.moduleSettings.displayWhenEmpty
|
get = function(info)
|
||||||
|
return IceHUD:GetSelectValue(info, self.moduleSettings.displayMode)
|
||||||
end,
|
end,
|
||||||
set = function(info, v)
|
set = function(info, v)
|
||||||
self.moduleSettings.displayWhenEmpty = v
|
self.moduleSettings.displayMode = info.option.values[v]
|
||||||
self:UpdateCustomBar()
|
self:UpdateCustomBar()
|
||||||
end,
|
end,
|
||||||
disabled = function()
|
disabled = function()
|
||||||
return not self.moduleSettings.enabled
|
return not self.moduleSettings.enabled
|
||||||
end,
|
end,
|
||||||
order = 30.9
|
order = 30.9,
|
||||||
}
|
}
|
||||||
|
|
||||||
opts["displayWhenTargeting"] = {
|
opts["displayWhenUnitExists"] = {
|
||||||
type = 'toggle',
|
type = 'toggle',
|
||||||
name = L["Display when targeting"],
|
name = L["Only if unit exists"],
|
||||||
desc = L["Whether to display this bar when you target a unit, even if the buff/debuff specified is not present."],
|
desc = L["If checked, the bar will only be displayed (according to the 'Display mode' rules) when the Unit to Track exists (e.g. if set to Target and you're targeting something)."],
|
||||||
get = function()
|
get = function(info)
|
||||||
return self.moduleSettings.displayWhenTargeting
|
return self.moduleSettings.displayWhenUnitExists
|
||||||
end,
|
end,
|
||||||
set = function(info, v)
|
set = function(info, v)
|
||||||
self.moduleSettings.displayWhenTargeting = v
|
self.moduleSettings.displayWhenUnitExists = v
|
||||||
self:UpdateCustomBar()
|
self:UpdateCustomBar()
|
||||||
end,
|
end,
|
||||||
disabled = function()
|
disabled = function()
|
||||||
return not self.moduleSettings.enabled
|
return not self.moduleSettings.enabled
|
||||||
end,
|
end,
|
||||||
order = 30.91
|
order = 30.91,
|
||||||
}
|
}
|
||||||
|
|
||||||
opts["buffTimerDisplay"] = {
|
opts["buffTimerDisplay"] = {
|
||||||
@ -864,9 +877,16 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.moduleSettings.displayWhenTargeting and self.target then
|
if self.moduleSettings.displayWhenUnitExists and not UnitExists(self.unit) then
|
||||||
|
IceCustomBar.super.prototype.Show(self, false)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if self.moduleSettings.displayMode == displayModes.MISSING then
|
||||||
|
IceCustomBar.super.prototype.Show(self, not bShouldShow)
|
||||||
|
elseif self.moduleSettings.displayMode == displayModes.WHEN_TARGETING and self.target then
|
||||||
IceCustomBar.super.prototype.Show(self, true)
|
IceCustomBar.super.prototype.Show(self, true)
|
||||||
elseif self.moduleSettings.displayWhenEmpty then
|
elseif self.moduleSettings.displayMode == displayModes.ALWAYS then
|
||||||
if not self.bIsVisible then
|
if not self.bIsVisible then
|
||||||
IceCustomBar.super.prototype.Show(self, true)
|
IceCustomBar.super.prototype.Show(self, true)
|
||||||
end
|
end
|
||||||
|
@ -144,6 +144,8 @@ function IceCustomHealth.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleHealthColor) then
|
if (self.moduleSettings.scaleHealthColor) then
|
||||||
self.color = "ScaledHealthColor"
|
self.color = "ScaledHealthColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
self.color = "ScaledHealthColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if (self.tapped) then
|
if (self.tapped) then
|
||||||
|
156
modules/DragonridingVigor.lua
Normal file
156
modules/DragonridingVigor.lua
Normal file
@ -0,0 +1,156 @@
|
|||||||
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
|
local DragonridingVigor = IceCore_CreateClass(IceClassPowerCounter)
|
||||||
|
|
||||||
|
local DragonridingBuffs = {
|
||||||
|
360954, -- Highland Drake
|
||||||
|
368896, -- Renewed Proto-Drake
|
||||||
|
368899, -- Windborn Velocidrake
|
||||||
|
368901, -- Cliffside Wylderdrake
|
||||||
|
}
|
||||||
|
|
||||||
|
local vigorWidgetSetID = 283
|
||||||
|
local vigorWidgetID = 4460
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:init()
|
||||||
|
DragonridingVigor.super.prototype.init(self, "Vigor")
|
||||||
|
|
||||||
|
self:SetDefaultColor("VigorNumeric", 150, 150, 255)
|
||||||
|
|
||||||
|
self.unit = "player"
|
||||||
|
self.numericColor = "VigorNumeric"
|
||||||
|
self.unitPower = ALTERNATE_POWER_INDEX
|
||||||
|
self.minLevel = 0
|
||||||
|
self.bTreatEmptyAsFull = false
|
||||||
|
self.runeWidth = self.runeHeight
|
||||||
|
self.shouldRegisterDisplayPower = false
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:Enable(core)
|
||||||
|
self.numRunes = UnitPowerMax(self.unit, ALTERNATE_POWER_INDEX)
|
||||||
|
self.runeCoords = { }
|
||||||
|
for i = 1, self.numRunes do
|
||||||
|
self:SetupNewRune(i)
|
||||||
|
end
|
||||||
|
|
||||||
|
DragonridingVigor.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
|
self:RegisterEvent("UNIT_AURA", "CheckShouldShow")
|
||||||
|
self:RegisterEvent("UPDATE_UI_WIDGET", "UpdateVigorRecharge")
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:EnteringWorld()
|
||||||
|
DragonridingVigor.super.prototype.EnteringWorld(self)
|
||||||
|
|
||||||
|
self:CheckShouldShow("player")
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
|
||||||
|
if unit ~= "player" then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if IceHUD:HasAnyBuff("player", DragonridingBuffs) then
|
||||||
|
self:Show(true)
|
||||||
|
else
|
||||||
|
self:Show(false)
|
||||||
|
if self.moduleSettings.hideBlizz then
|
||||||
|
self:ShowBlizz()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:UpdateRunePower(event, arg1, arg2)
|
||||||
|
self:UpdateVigorRecharge("internal")
|
||||||
|
DragonridingVigor.super.prototype.UpdateRunePower(self, event, arg1, arg2)
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:UpdateVigorRecharge(event, widget)
|
||||||
|
self.partialReady = nil
|
||||||
|
self.partialReadyPercent = nil
|
||||||
|
if event ~= "internal" and (not widget or widget.widgetSetID ~= vigorWidgetSetID) then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if event ~= "internal" then
|
||||||
|
if self.moduleSettings.hideBlizz then
|
||||||
|
self:HideBlizz()
|
||||||
|
else
|
||||||
|
self:ShowBlizz()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
|
||||||
|
if not info then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if info.numFullFrames == info.numTotalFrames then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if info.fillMax == 0 then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
self.partialReady = IceHUD:Clamp(info.numFullFrames + 1, 0, info.numTotalFrames)
|
||||||
|
self.partialReadyPercent = info.fillValue / info.fillMax
|
||||||
|
if event ~= "internal" then
|
||||||
|
self:UpdateRunePower()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:SetupNewRune(rune)
|
||||||
|
self.runeCoords[rune] = {0, 1, 0, 1}
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:GetDefaultSettings()
|
||||||
|
local defaults = DragonridingVigor.super.prototype.GetDefaultSettings(self)
|
||||||
|
|
||||||
|
defaults.pulseWhenFull = false
|
||||||
|
defaults.runeGap = 4
|
||||||
|
defaults.inactiveDisplayMode = "Shown"
|
||||||
|
defaults.hideBlizz = true
|
||||||
|
defaults.vpos = -25
|
||||||
|
|
||||||
|
return defaults
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:GetOptions()
|
||||||
|
local opts = DragonridingVigor.super.prototype.GetOptions(self)
|
||||||
|
|
||||||
|
opts.inactiveDisplayMode.hidden = function() return true end
|
||||||
|
|
||||||
|
return opts
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:GetRuneAtlas(rune)
|
||||||
|
return "dragonriding_vigor_fillfull"
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:GetShineAtlas(rune)
|
||||||
|
return "Mage-ArcaneCharge-SmallSpark"
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:GetFrameAtlas(rune)
|
||||||
|
return "dragonriding_vigor_frame"
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:GetBackgroundAtlas(rune)
|
||||||
|
return "dragonriding_vigor_background"
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:GetPartialRuneAtlas(rune)
|
||||||
|
return "dragonriding_vigor_fill"
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:ShowBlizz()
|
||||||
|
UIWidgetPowerBarContainerFrame:Show()
|
||||||
|
end
|
||||||
|
|
||||||
|
function DragonridingVigor.prototype:HideBlizz()
|
||||||
|
UIWidgetPowerBarContainerFrame:Hide()
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Load us up
|
||||||
|
if ALTERNATE_POWER_INDEX and C_UIWidgetManager and C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo then
|
||||||
|
IceHUD.DragonridingVigor = DragonridingVigor:new()
|
||||||
|
end
|
123
modules/DruidEnergy.lua
Normal file
123
modules/DruidEnergy.lua
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
|
local DruidEnergy = IceCore_CreateClass(IceUnitBar)
|
||||||
|
|
||||||
|
DruidEnergy.prototype.DruidEnergy = nil
|
||||||
|
DruidEnergy.prototype.DruidEnergyMax = nil
|
||||||
|
|
||||||
|
local _, unitClass = UnitClass("player")
|
||||||
|
|
||||||
|
local FORM_NONE = 0
|
||||||
|
local FORM_BEAR = 1
|
||||||
|
local FORM_TRAVEL = 3
|
||||||
|
|
||||||
|
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||||
|
if Enum and Enum.PowerType then
|
||||||
|
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||||
|
end
|
||||||
|
|
||||||
|
local shapeshiftFormValues = {NONE = L["No form"], BEAR = L["Bear"], TRAVEL = L["Travel"], OTHER = L["Other"]}
|
||||||
|
local shapeshiftFormIds = {NONE = FORM_NONE, BEAR = FORM_BEAR, TRAVEL = FORM_TRAVEL}
|
||||||
|
|
||||||
|
function DruidEnergy.prototype:init()
|
||||||
|
DruidEnergy.super.prototype.init(self, "DruidEnergy", "player")
|
||||||
|
|
||||||
|
self.side = IceCore.Side.Left
|
||||||
|
self.offset = 5
|
||||||
|
|
||||||
|
self:SetDefaultColor("DruidEnergy", 218, 231, 31)
|
||||||
|
end
|
||||||
|
|
||||||
|
function DruidEnergy.prototype:GetDefaultSettings()
|
||||||
|
local settings = DruidEnergy.super.prototype.GetDefaultSettings(self)
|
||||||
|
|
||||||
|
settings["side"] = IceCore.Side.Left
|
||||||
|
settings["offset"] = 5
|
||||||
|
settings["textVisible"] = {upper = true, lower = false}
|
||||||
|
settings["upperText"] = "[PercentMP(type='Energy'):Round]"
|
||||||
|
settings["lowerText"] = "[FractionalMP(type='Energy'):Color('dae71f'):Bracket]"
|
||||||
|
settings.enabled = false
|
||||||
|
settings.whileInForm = {["BEAR"] = true}
|
||||||
|
|
||||||
|
return settings
|
||||||
|
end
|
||||||
|
|
||||||
|
function DruidEnergy.prototype:GetOptions()
|
||||||
|
local opts = DruidEnergy.super.prototype.GetOptions(self)
|
||||||
|
|
||||||
|
opts["whileInForm"] = {
|
||||||
|
type = 'multiselect',
|
||||||
|
values = shapeshiftFormValues,
|
||||||
|
name = L["Show in form"],
|
||||||
|
desc = L["When the player is in one of the chosen shapeshift forms the bar will be shown, otherwise it will be hidden."],
|
||||||
|
get = function(info, v)
|
||||||
|
for key, value in pairs(self.moduleSettings.whileInForm) do
|
||||||
|
if key == v then
|
||||||
|
return value
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
|
end,
|
||||||
|
set = function(info, v, state)
|
||||||
|
self.moduleSettings.whileInForm[v] = state
|
||||||
|
self:Update()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
|
return opts
|
||||||
|
end
|
||||||
|
|
||||||
|
function DruidEnergy.prototype:Enable(core)
|
||||||
|
DruidEnergy.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
|
self:RegisterEvent("UPDATE_SHAPESHIFT_FORM", "Update")
|
||||||
|
self:RegisterEvent("UNIT_POWER_FREQUENT", "Update")
|
||||||
|
self:RegisterEvent("UNIT_MAXPOWER", "Update")
|
||||||
|
end
|
||||||
|
|
||||||
|
function DruidEnergy.prototype:GetElementDescription()
|
||||||
|
return L["Always shows the Druid's Energy level while in non-energy-using forms."]
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function DruidEnergy.prototype:ShouldShow(unit)
|
||||||
|
local currentForm = GetShapeshiftForm()
|
||||||
|
for k, v in pairs(self.moduleSettings.whileInForm) do
|
||||||
|
if currentForm > FORM_TRAVEL and k == "OTHER" then
|
||||||
|
return v
|
||||||
|
elseif currentForm == shapeshiftFormIds[k] then
|
||||||
|
return v
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
function DruidEnergy.prototype:Update()
|
||||||
|
DruidEnergy.super.prototype.Update(self)
|
||||||
|
|
||||||
|
self.DruidEnergy = UnitPower(self.unit, SPELL_POWER_ENERGY)
|
||||||
|
self.DruidEnergyMax = UnitPowerMax(self.unit, SPELL_POWER_ENERGY)
|
||||||
|
self.DruidEnergyPercentage = self.DruidEnergyMax ~= 0 and (self.DruidEnergy/self.DruidEnergyMax) or 0
|
||||||
|
|
||||||
|
if (not self.alive or not self:ShouldShow(self.unit) or not self.DruidEnergy or not self.DruidEnergyMax or self.DruidEnergyMax == 0) then
|
||||||
|
self:Show(false)
|
||||||
|
return
|
||||||
|
else
|
||||||
|
self:Show(true)
|
||||||
|
end
|
||||||
|
|
||||||
|
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||||
|
self:SetBottomText1(math.floor(self.DruidEnergyPercentage * 100))
|
||||||
|
self:SetBottomText2(self:GetFormattedText(self:Round(self.DruidEnergy), self:Round(self.DruidEnergyMax)), "DruidEnergy")
|
||||||
|
end
|
||||||
|
|
||||||
|
self:UpdateBar(self.DruidEnergyMax ~= 0 and self.DruidEnergy / self.DruidEnergyMax or 0, "DruidEnergy")
|
||||||
|
end
|
||||||
|
|
||||||
|
if unitClass == "DRUID" then
|
||||||
|
IceHUD.DruidEnergy = DruidEnergy:new()
|
||||||
|
end
|
74
modules/EssencePower.lua
Normal file
74
modules/EssencePower.lua
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
|
local EssencePower = IceCore_CreateClass(IceClassPowerCounter)
|
||||||
|
|
||||||
|
local SPELL_POWER_ESSENCE = SPELL_POWER_ESSENCE
|
||||||
|
if Enum and Enum.PowerType then
|
||||||
|
SPELL_POWER_ESSENCE = Enum.PowerType.Essence
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:init()
|
||||||
|
EssencePower.super.prototype.init(self, "EssencePower")
|
||||||
|
|
||||||
|
self:SetDefaultColor("EssencePowerNumeric", 150, 150, 255)
|
||||||
|
|
||||||
|
self.unit = "player"
|
||||||
|
self.numericColor = "EssencePowerNumeric"
|
||||||
|
self.unitPower = SPELL_POWER_ESSENCE
|
||||||
|
self.minLevel = 0
|
||||||
|
self.bTreatEmptyAsFull = false
|
||||||
|
self.runeWidth = self.runeHeight
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:Enable(core)
|
||||||
|
self.numRunes = UnitPowerMax(self.unit, SPELL_POWER_ESSENCE)
|
||||||
|
self.runeCoords = { }
|
||||||
|
for i = 1, self.numRunes do
|
||||||
|
self:SetupNewRune(i)
|
||||||
|
end
|
||||||
|
|
||||||
|
EssencePower.super.prototype.Enable(self, core)
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:SetupNewRune(rune)
|
||||||
|
self.runeCoords[rune] = {0, 1, 0, 1}
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:GetPowerEvent()
|
||||||
|
return "UNIT_POWER_FREQUENT"
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:GetDefaultSettings()
|
||||||
|
local defaults = EssencePower.super.prototype.GetDefaultSettings(self)
|
||||||
|
|
||||||
|
defaults["pulseWhenFull"] = false
|
||||||
|
|
||||||
|
return defaults
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:GetOptions()
|
||||||
|
local opts = EssencePower.super.prototype.GetOptions(self)
|
||||||
|
|
||||||
|
opts.hideBlizz.hidden = function() return true end
|
||||||
|
|
||||||
|
return opts
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:GetRuneAtlas(rune)
|
||||||
|
return "UF-Essence-Icon"
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:GetShineAtlas(rune)
|
||||||
|
return "Mage-ArcaneCharge-SmallSpark"
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:ShowBlizz()
|
||||||
|
end
|
||||||
|
|
||||||
|
function EssencePower.prototype:HideBlizz()
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Load us up
|
||||||
|
local _, unitClass = UnitClass("player")
|
||||||
|
if unitClass == "EVOKER" then
|
||||||
|
IceHUD.EssencePower = EssencePower:new()
|
||||||
|
end
|
@ -364,6 +364,8 @@ function FocusHealth.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleHealthColor) then
|
if (self.moduleSettings.scaleHealthColor) then
|
||||||
self.color = "ScaledHealthColor"
|
self.color = "ScaledHealthColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
self.color = "ScaledHealthColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if (self.tapped) then
|
if (self.tapped) then
|
||||||
|
@ -88,6 +88,8 @@ function FocusMana.prototype:Update(unit)
|
|||||||
local color = "FocusMana"
|
local color = "FocusMana"
|
||||||
if (self.moduleSettings.scaleManaColor) then
|
if (self.moduleSettings.scaleManaColor) then
|
||||||
color = "ScaledManaColor"
|
color = "ScaledManaColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
color = "ScaledManaColor"
|
||||||
end
|
end
|
||||||
if (manaType == SPELL_POWER_RAGE) then
|
if (manaType == SPELL_POWER_RAGE) then
|
||||||
color = "FocusRage"
|
color = "FocusRage"
|
||||||
|
@ -93,6 +93,8 @@ function PetHealth.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleHealthColor) then
|
if (self.moduleSettings.scaleHealthColor) then
|
||||||
color = "ScaledHealthColor"
|
color = "ScaledHealthColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
color = "ScaledHealthColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if not (self.alive) then
|
if not (self.alive) then
|
||||||
|
@ -173,6 +173,8 @@ function PetMana.prototype:Update(unit)
|
|||||||
local color = "PetMana"
|
local color = "PetMana"
|
||||||
if (self.moduleSettings.scaleManaColor) then
|
if (self.moduleSettings.scaleManaColor) then
|
||||||
color = "ScaledManaColor"
|
color = "ScaledManaColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
color = "ScaledManaColor"
|
||||||
end
|
end
|
||||||
if not (self.alive) then
|
if not (self.alive) then
|
||||||
color = "Dead"
|
color = "Dead"
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
IceHUDPlayerAlternatePower = IceCore_CreateClass(IceUnitBar)
|
local PlayerAlternatePower = IceCore_CreateClass(IceUnitBar)
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function IceHUDPlayerAlternatePower.prototype:init(moduleName, unit)
|
function PlayerAlternatePower.prototype:init(moduleName, unit)
|
||||||
IceHUDPlayerAlternatePower.super.prototype.init(self, moduleName or "PlayerAlternatePower", "player")
|
PlayerAlternatePower.super.prototype.init(self, moduleName or "PlayerAlternatePower", "player")
|
||||||
|
|
||||||
self.bTreatEmptyAsFull = true
|
self.bTreatEmptyAsFull = true
|
||||||
self.power = 0
|
self.power = 0
|
||||||
@ -13,8 +13,8 @@ function IceHUDPlayerAlternatePower.prototype:init(moduleName, unit)
|
|||||||
self.powerName = "MANA"
|
self.powerName = "MANA"
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:GetDefaultSettings()
|
function PlayerAlternatePower.prototype:GetDefaultSettings()
|
||||||
local settings = IceHUDPlayerAlternatePower.super.prototype.GetDefaultSettings(self)
|
local settings = PlayerAlternatePower.super.prototype.GetDefaultSettings(self)
|
||||||
|
|
||||||
settings["side"] = IceCore.Side.Left
|
settings["side"] = IceCore.Side.Left
|
||||||
settings["offset"] = -1
|
settings["offset"] = -1
|
||||||
@ -25,8 +25,8 @@ function IceHUDPlayerAlternatePower.prototype:GetDefaultSettings()
|
|||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:Enable(core)
|
function PlayerAlternatePower.prototype:Enable(core)
|
||||||
IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
|
PlayerAlternatePower.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||||
if IceHUD.EventExistsUnitMaxPower then
|
if IceHUD.EventExistsUnitMaxPower then
|
||||||
@ -39,40 +39,50 @@ function IceHUDPlayerAlternatePower.prototype:Enable(core)
|
|||||||
|
|
||||||
if self.maxPower == 0 then
|
if self.maxPower == 0 then
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
|
else
|
||||||
|
self.wantToShow = true
|
||||||
end
|
end
|
||||||
if self.moduleSettings.hideBlizz then
|
if self.moduleSettings.hideBlizz then
|
||||||
self:HideBlizz()
|
self:HideBlizz()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:PowerBarShow(event, unit)
|
function PlayerAlternatePower.prototype:PowerBarShow(event, unit)
|
||||||
if unit ~= self.unit then
|
if unit ~= self.unit then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self.wantToShow = true
|
||||||
self:Show(true)
|
self:Show(true)
|
||||||
self:Update(self.unit)
|
self:Update(self.unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:PowerBarHide(event, unit)
|
function PlayerAlternatePower.prototype:PowerBarHide(event, unit)
|
||||||
if unit ~= self.unit then
|
if unit ~= self.unit then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self.wantToShow = false
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
self:Update(self.unit)
|
self:Update(self.unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:UpdateEvent(event, unit)
|
function PlayerAlternatePower.prototype:UpdateEvent(event, unit)
|
||||||
self:Update(unit)
|
self:Update(unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:Update(unit)
|
function PlayerAlternatePower.prototype:Update(unit)
|
||||||
IceHUDPlayerAlternatePower.super.prototype.Update(self)
|
PlayerAlternatePower.super.prototype.Update(self)
|
||||||
if (unit and (unit ~= self.unit)) then
|
if (unit and (unit ~= self.unit)) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if IceHUD.DragonridingVigor and IceHUD.DragonridingVigor.bIsVisible then
|
||||||
|
self:Show(false)
|
||||||
|
elseif self.wantToShow then
|
||||||
|
self:Show(true)
|
||||||
|
end
|
||||||
|
|
||||||
self.maxPower = UnitPowerMax(self.unit, self.powerIndex)
|
self.maxPower = UnitPowerMax(self.unit, self.powerIndex)
|
||||||
self.power = UnitPower(self.unit, self.powerIndex)
|
self.power = UnitPower(self.unit, self.powerIndex)
|
||||||
if self.maxPower > 0 then
|
if self.maxPower > 0 then
|
||||||
@ -92,8 +102,8 @@ function IceHUDPlayerAlternatePower.prototype:Update(unit)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:GetOptions()
|
function PlayerAlternatePower.prototype:GetOptions()
|
||||||
local opts = IceHUDPlayerAlternatePower.super.prototype.GetOptions(self)
|
local opts = PlayerAlternatePower.super.prototype.GetOptions(self)
|
||||||
|
|
||||||
opts["lowThresholdColor"] = nil
|
opts["lowThresholdColor"] = nil
|
||||||
|
|
||||||
@ -121,11 +131,11 @@ function IceHUDPlayerAlternatePower.prototype:GetOptions()
|
|||||||
return opts
|
return opts
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:ShowBlizz()
|
function PlayerAlternatePower.prototype:ShowBlizz()
|
||||||
PlayerPowerBarAlt:GetScript("OnLoad")(PlayerPowerBarAlt)
|
PlayerPowerBarAlt:GetScript("OnLoad")(PlayerPowerBarAlt)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceHUDPlayerAlternatePower.prototype:HideBlizz()
|
function PlayerAlternatePower.prototype:HideBlizz()
|
||||||
PlayerPowerBarAlt:Hide()
|
PlayerPowerBarAlt:Hide()
|
||||||
|
|
||||||
PlayerPowerBarAlt:UnregisterAllEvents()
|
PlayerPowerBarAlt:UnregisterAllEvents()
|
||||||
@ -133,5 +143,5 @@ end
|
|||||||
|
|
||||||
-- Load us up
|
-- Load us up
|
||||||
if ALTERNATE_POWER_INDEX then
|
if ALTERNATE_POWER_INDEX then
|
||||||
IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
|
IceHUD.PlayerAlternatePower = PlayerAlternatePower:new()
|
||||||
end
|
end
|
||||||
|
@ -1276,6 +1276,8 @@ function PlayerHealth.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleHealthColor) then
|
if (self.moduleSettings.scaleHealthColor) then
|
||||||
color = "ScaledHealthColor"
|
color = "ScaledHealthColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
color = "ScaledHealthColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if not (self.alive) then
|
if not (self.alive) then
|
||||||
@ -1418,6 +1420,44 @@ function PlayerHealth.prototype:HideBlizz()
|
|||||||
PlayerFrame:SetParent(self.PlayerFrameParent)
|
PlayerFrame:SetParent(self.PlayerFrameParent)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local parents = {}
|
||||||
|
local hide_frame = IceHUD:OutOfCombatWrapper(function(self) self:Hide() end)
|
||||||
|
|
||||||
|
local function hook_frames(...)
|
||||||
|
for i = 1, select("#", ...) do
|
||||||
|
local frame = select(i, ...)
|
||||||
|
frame:UnregisterAllEvents()
|
||||||
|
if not IceHUD:IsHooked(frame, "OnShow") then
|
||||||
|
IceHUD:SecureHookScript(frame, "OnShow", hide_frame)
|
||||||
|
end
|
||||||
|
frame:Hide()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function unhook_frame(frame)
|
||||||
|
if IceHUD:IsHooked(frame, "OnShow") then
|
||||||
|
IceHUD:Unhook(frame, "OnShow")
|
||||||
|
local parent = parents[frame]
|
||||||
|
if parent then
|
||||||
|
frame:SetParent(parent)
|
||||||
|
end
|
||||||
|
elseif IceHUD:IsHooked(frame, "Show") then
|
||||||
|
IceHUD:Unhook(frame, "Show")
|
||||||
|
IceHUD:Unhook(frame, "SetPoint")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function unhook_frames(...)
|
||||||
|
for i = 1, select("#", ...) do
|
||||||
|
local frame = select(i, ...)
|
||||||
|
unhook_frame(frame)
|
||||||
|
local handler = frame:GetScript("OnLoad")
|
||||||
|
if handler then
|
||||||
|
handler(frame)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function PlayerHealth.prototype:HideBlizzardParty()
|
function PlayerHealth.prototype:HideBlizzardParty()
|
||||||
if self.combat then
|
if self.combat then
|
||||||
self.pendingBlizzardPartyHide = true
|
self.pendingBlizzardPartyHide = true
|
||||||
|
@ -115,15 +115,33 @@ end
|
|||||||
|
|
||||||
function PlayerInfo.prototype:ShowBlizz()
|
function PlayerInfo.prototype:ShowBlizz()
|
||||||
BuffFrame:Show()
|
BuffFrame:Show()
|
||||||
TemporaryEnchantFrame:Show()
|
if DebuffFrame then
|
||||||
|
DebuffFrame:Show()
|
||||||
|
DebuffFrame:GetScript("OnLoad")(DebuffFrame)
|
||||||
|
if DebuffFrame.Update then
|
||||||
|
DebuffFrame:Update()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if TemporaryEnchantFrame then
|
||||||
|
TemporaryEnchantFrame:Show()
|
||||||
|
end
|
||||||
|
|
||||||
BuffFrame:GetScript("OnLoad")(BuffFrame)
|
BuffFrame:GetScript("OnLoad")(BuffFrame)
|
||||||
|
if BuffFrame.Update then
|
||||||
|
BuffFrame:Update()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function PlayerInfo.prototype:HideBlizz()
|
function PlayerInfo.prototype:HideBlizz()
|
||||||
BuffFrame:Hide()
|
BuffFrame:Hide()
|
||||||
TemporaryEnchantFrame:Hide()
|
if DebuffFrame then
|
||||||
|
DebuffFrame:Hide()
|
||||||
|
DebuffFrame:UnregisterAllEvents()
|
||||||
|
end
|
||||||
|
if TemporaryEnchantFrame then
|
||||||
|
TemporaryEnchantFrame:Hide()
|
||||||
|
end
|
||||||
|
|
||||||
BuffFrame:UnregisterAllEvents()
|
BuffFrame:UnregisterAllEvents()
|
||||||
end
|
end
|
||||||
|
@ -344,6 +344,8 @@ function PlayerMana.prototype:Update(unit, powertype)
|
|||||||
color = "Dead"
|
color = "Dead"
|
||||||
elseif (self.moduleSettings.scaleManaColor and (UnitPowerType(self.unit) == SPELL_POWER_MANA or self.moduleSettings.scaleManaColorForAll)) then
|
elseif (self.moduleSettings.scaleManaColor and (UnitPowerType(self.unit) == SPELL_POWER_MANA or self.moduleSettings.scaleManaColorForAll)) then
|
||||||
color = "ScaledManaColor"
|
color = "ScaledManaColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
color = "ScaledManaColor"
|
||||||
else
|
else
|
||||||
if (self.manaType == SPELL_POWER_RAGE) then
|
if (self.manaType == SPELL_POWER_RAGE) then
|
||||||
color = "PlayerRage"
|
color = "PlayerRage"
|
||||||
|
@ -274,7 +274,7 @@ end
|
|||||||
function RollTheBones.prototype:MyOnUpdate()
|
function RollTheBones.prototype:MyOnUpdate()
|
||||||
RollTheBones.super.prototype.MyOnUpdate(self)
|
RollTheBones.super.prototype.MyOnUpdate(self)
|
||||||
if self.bUpdateRtb then
|
if self.bUpdateRtb then
|
||||||
self:UpdateRollTheBones(nil, self.unit, true)
|
self:UpdateRollTheBones("internal", self.unit)
|
||||||
end
|
end
|
||||||
if self.target or self.moduleSettings.bShowWithNoTarget then
|
if self.target or self.moduleSettings.bShowWithNoTarget then
|
||||||
self:UpdateDurationBar()
|
self:UpdateDurationBar()
|
||||||
@ -296,13 +296,14 @@ local function ShouldHide()
|
|||||||
return not HasSpell(193316)
|
return not HasSpell(193316)
|
||||||
end
|
end
|
||||||
|
|
||||||
function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
|
function RollTheBones.prototype:UpdateRollTheBones(event, unit)
|
||||||
if unit and unit ~= self.unit then
|
if unit and unit ~= self.unit then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local now = GetTime()
|
local now = GetTime()
|
||||||
local remaining = nil
|
local remaining = nil
|
||||||
|
local fromUpdate = event == "internal"
|
||||||
|
|
||||||
if not fromUpdate then
|
if not fromUpdate then
|
||||||
rtbDuration, remaining, rtbCount = self:GetBuffDuration(self.unit, RtBSet)
|
rtbDuration, remaining, rtbCount = self:GetBuffDuration(self.unit, RtBSet)
|
||||||
|
@ -131,7 +131,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
|
|||||||
|
|
||||||
self.shouldShowUnmodified = false
|
self.shouldShowUnmodified = false
|
||||||
self.requiredSpec = CurrentSpec
|
self.requiredSpec = CurrentSpec
|
||||||
self.currentGrowMode = nil
|
self.currentGrowMode = self.growModes["height"]
|
||||||
|
|
||||||
if CurrentSpec == SPEC_WARLOCK_AFFLICTION then
|
if CurrentSpec == SPEC_WARLOCK_AFFLICTION then
|
||||||
self.runeCoords = AfflictionCoords
|
self.runeCoords = AfflictionCoords
|
||||||
|
@ -277,7 +277,7 @@ end
|
|||||||
function SliceAndDice.prototype:MyOnUpdate()
|
function SliceAndDice.prototype:MyOnUpdate()
|
||||||
SliceAndDice.super.prototype.MyOnUpdate(self)
|
SliceAndDice.super.prototype.MyOnUpdate(self)
|
||||||
if self.bUpdateSnd then
|
if self.bUpdateSnd then
|
||||||
self:UpdateSliceAndDice(nil, self.unit, true)
|
self:UpdateSliceAndDice("internal", self.unit)
|
||||||
end
|
end
|
||||||
if self.target or self.moduleSettings.bShowWithNoTarget then
|
if self.target or self.moduleSettings.bShowWithNoTarget then
|
||||||
self:UpdateDurationBar()
|
self:UpdateDurationBar()
|
||||||
@ -312,13 +312,14 @@ local function ShouldHide()
|
|||||||
-- with different durations
|
-- with different durations
|
||||||
end
|
end
|
||||||
|
|
||||||
function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
|
function SliceAndDice.prototype:UpdateSliceAndDice(event, unit)
|
||||||
if unit and unit ~= self.unit then
|
if unit and unit ~= self.unit then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local now = GetTime()
|
local now = GetTime()
|
||||||
local remaining = nil
|
local remaining = nil
|
||||||
|
local fromUpdate = event == "internal"
|
||||||
|
|
||||||
if not fromUpdate or IceHUD.WowVer < 30000 then
|
if not fromUpdate or IceHUD.WowVer < 30000 then
|
||||||
sndDuration, remaining = self:GetBuffDuration(self.unit, sndBuffName)
|
sndDuration, remaining = self:GetBuffDuration(self.unit, sndBuffName)
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||||
IceTargetAbsorb = IceCore_CreateClass(IceUnitBar)
|
IceTargetAbsorb = IceCore_CreateClass(IceUnitBar)
|
||||||
|
|
||||||
IceTargetAbsorb.prototype.highestAbsorbSinceLastZero = 0
|
IceTargetAbsorb.prototype.highestAbsorbSinceLastZero = 0
|
||||||
@ -29,6 +30,28 @@ function IceTargetAbsorb.prototype:GetDefaultSettings()
|
|||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function IceTargetAbsorb.prototype:GetOptions()
|
||||||
|
local opts = IceTargetAbsorb.super.prototype.GetOptions(self)
|
||||||
|
|
||||||
|
opts["scaleToUnitHealth"] = {
|
||||||
|
type = 'toggle',
|
||||||
|
name = L["Scale to health"],
|
||||||
|
desc = L["Whether the bar's maximum value should be set to the unit's maximum health or not. If set, any absorb above that amount will not be shown."],
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.scaleToUnitHealth
|
||||||
|
end,
|
||||||
|
set = function(info, v)
|
||||||
|
self.moduleSettings.scaleToUnitHealth = v
|
||||||
|
self:Update()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
return opts
|
||||||
|
end
|
||||||
|
|
||||||
function IceTargetAbsorb.prototype:Enable(core)
|
function IceTargetAbsorb.prototype:Enable(core)
|
||||||
IceTargetAbsorb.super.prototype.Enable(self, core)
|
IceTargetAbsorb.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
@ -47,6 +70,7 @@ function IceTargetAbsorb.prototype:MyUnregisterCustomEvents()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceTargetAbsorb.prototype:Update()
|
function IceTargetAbsorb.prototype:Update()
|
||||||
|
IceTargetAbsorb.super.prototype.Update(self)
|
||||||
self:UpdateAbsorbAmount()
|
self:UpdateAbsorbAmount()
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -63,13 +87,17 @@ 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
|
local maxAbsorb = self.highestAbsorbSinceLastZero
|
||||||
|
if self.moduleSettings.scaleToUnitHealth then
|
||||||
|
maxAbsorb = self.maxHealth
|
||||||
|
end
|
||||||
|
self.absorbPercent = maxAbsorb ~= 0 and IceHUD:Clamp(absorbAmount / maxAbsorb, 0, 1) or 0
|
||||||
|
|
||||||
if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
|
if absorbAmount <= 0 or maxAbsorb <= 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(self.absorbPercent, self.ColorName)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||||
|
@ -72,10 +72,20 @@ local IncapacitateCCList = {
|
|||||||
19503,
|
19503,
|
||||||
-- Sleep
|
-- Sleep
|
||||||
700,
|
700,
|
||||||
-- Polymorph
|
-- Polymorph (rank 1)
|
||||||
118,
|
118,
|
||||||
|
-- Also Polymorph
|
||||||
|
65801,
|
||||||
|
-- Polymorph rank 2
|
||||||
|
12824,
|
||||||
|
-- Polymorph rank 3
|
||||||
|
12825,
|
||||||
|
-- Polymorph rank 4
|
||||||
|
12826,
|
||||||
-- Polymorph: Pig
|
-- Polymorph: Pig
|
||||||
28272,
|
28272,
|
||||||
|
-- Also Polymorph: Pig
|
||||||
|
28285,
|
||||||
-- Polymorph: Turtle
|
-- Polymorph: Turtle
|
||||||
28271,
|
28271,
|
||||||
-- Polymorph: Penguin
|
-- Polymorph: Penguin
|
||||||
@ -375,11 +385,12 @@ end
|
|||||||
|
|
||||||
function TargetCC.prototype:MyOnUpdate()
|
function TargetCC.prototype:MyOnUpdate()
|
||||||
TargetCC.super.prototype.MyOnUpdate(self)
|
TargetCC.super.prototype.MyOnUpdate(self)
|
||||||
self:UpdateTargetDebuffs(nil, self.unit, true)
|
self:UpdateTargetDebuffs("internal", self.unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
function TargetCC.prototype:UpdateTargetDebuffs(event, unit, isUpdate)
|
function TargetCC.prototype:UpdateTargetDebuffs(event, unit)
|
||||||
local name, duration, remaining
|
local name, duration, remaining
|
||||||
|
local isUpdate = event == "internal"
|
||||||
|
|
||||||
if not isUpdate or not self.lastUpdateTime then
|
if not isUpdate or not self.lastUpdateTime then
|
||||||
self.debuffName, self.debuffDuration, self.debuffRemaining = self:GetMaxDebuffDuration(self.unit, self.debuffList)
|
self.debuffName, self.debuffDuration, self.debuffRemaining = self:GetMaxDebuffDuration(self.unit, self.debuffList)
|
||||||
|
@ -841,6 +841,8 @@ function IceTargetHealth.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleHealthColor) then
|
if (self.moduleSettings.scaleHealthColor) then
|
||||||
self.color = "ScaledHealthColor"
|
self.color = "ScaledHealthColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
self.color = "ScaledHealthColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if (self.tapped) then
|
if (self.tapped) then
|
||||||
|
@ -191,11 +191,12 @@ end
|
|||||||
|
|
||||||
function TargetInvuln.prototype:MyOnUpdate()
|
function TargetInvuln.prototype:MyOnUpdate()
|
||||||
TargetInvuln.super.prototype.MyOnUpdate(self)
|
TargetInvuln.super.prototype.MyOnUpdate(self)
|
||||||
self:UpdateTargetBuffs(nil, self.unit, true)
|
self:UpdateTargetBuffs("internal", self.unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
function TargetInvuln.prototype:UpdateTargetBuffs(event, unit, isUpdate)
|
function TargetInvuln.prototype:UpdateTargetBuffs(event, unit)
|
||||||
local name, duration, remaining
|
local name, duration, remaining
|
||||||
|
local isUpdate = event == "internal"
|
||||||
|
|
||||||
if not isUpdate or not self.lastUpdateTime then
|
if not isUpdate or not self.lastUpdateTime then
|
||||||
self.buffName, self.buffDuration, self.buffRemaining = self:GetMaxbuffDuration(self.unit, self.buffList)
|
self.buffName, self.buffDuration, self.buffRemaining = self:GetMaxbuffDuration(self.unit, self.buffList)
|
||||||
|
@ -125,6 +125,8 @@ function IceTargetMana.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleManaColor) then
|
if (self.moduleSettings.scaleManaColor) then
|
||||||
self.color = "ScaledManaColor"
|
self.color = "ScaledManaColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
self.color = "ScaledManaColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if (manaType == SPELL_POWER_RAGE) then
|
if (manaType == SPELL_POWER_RAGE) then
|
||||||
|
@ -136,6 +136,8 @@ function TargetTargetHealth.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleHealthColor) then
|
if (self.moduleSettings.scaleHealthColor) then
|
||||||
self.color = "ScaledHealthColor"
|
self.color = "ScaledHealthColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
self.color = "ScaledHealthColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if (self.tapped) then
|
if (self.tapped) then
|
||||||
|
@ -83,6 +83,8 @@ function TargetTargetMana.prototype:Update(unit)
|
|||||||
|
|
||||||
if (self.moduleSettings.scaleManaColor) then
|
if (self.moduleSettings.scaleManaColor) then
|
||||||
self.color = "ScaledManaColor"
|
self.color = "ScaledManaColor"
|
||||||
|
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||||
|
self.color = "ScaledManaColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
if (manaType == 1) then
|
if (manaType == 1) then
|
||||||
|
@ -89,11 +89,11 @@ function Totems.prototype:GetOptions()
|
|||||||
end,
|
end,
|
||||||
order = 31
|
order = 31
|
||||||
}
|
}
|
||||||
--[[
|
|
||||||
opts["hideBlizz"] = {
|
opts["hideBlizz"] = {
|
||||||
type = "toggle",
|
type = "toggle",
|
||||||
name = L["Hide Blizzard Frame"],
|
name = L["Hide Blizzard Frame"],
|
||||||
desc = L["Hides Blizzard Rune frame and disables all events related to it"],
|
desc = L["Hides Blizzard frame and disables all events related to it.\n\nNOTE: Blizzard attaches this UI to the player's unitframe, so if you have that hidden in PlayerHealth, then this won't do anything."],
|
||||||
get = function()
|
get = function()
|
||||||
return self.moduleSettings.hideBlizz
|
return self.moduleSettings.hideBlizz
|
||||||
end,
|
end,
|
||||||
@ -110,7 +110,7 @@ function Totems.prototype:GetOptions()
|
|||||||
end,
|
end,
|
||||||
order = 32
|
order = 32
|
||||||
}
|
}
|
||||||
--]]
|
|
||||||
opts["displayMode"] = {
|
opts["displayMode"] = {
|
||||||
type = 'select',
|
type = 'select',
|
||||||
name = L["Totem orientation"],
|
name = L["Totem orientation"],
|
||||||
@ -193,7 +193,7 @@ function Totems.prototype:GetDefaultSettings()
|
|||||||
defaults["totemFontSize"] = 20
|
defaults["totemFontSize"] = 20
|
||||||
defaults["totemMode"] = "Graphical"
|
defaults["totemMode"] = "Graphical"
|
||||||
defaults["usesDogTagStrings"] = false
|
defaults["usesDogTagStrings"] = false
|
||||||
defaults["hideBlizz"] = true
|
defaults["hideBlizz"] = IceHUD.CanHookDestroyTotem
|
||||||
defaults["alwaysFullAlpha"] = false
|
defaults["alwaysFullAlpha"] = false
|
||||||
defaults["displayMode"] = "Horizontal"
|
defaults["displayMode"] = "Horizontal"
|
||||||
defaults["cooldownMode"] = "Cooldown"
|
defaults["cooldownMode"] = "Cooldown"
|
||||||
|
@ -1,22 +1,90 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
v1.13.17.3:
|
v1.14.18:
|
||||||
|
|
||||||
- Packaged latest LibDogTag-Unit to work around crash in Wrath Classic client.
|
- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
|
||||||
|
- Added option (enabled by default) to hide mod during cataloging.
|
||||||
|
- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
|
||||||
|
- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
|
||||||
|
|
||||||
v1.13.17.2:
|
v1.14.17:
|
||||||
|
|
||||||
- Fixed Runes disappearing for Death Knights on Wrath Classic when using the dual spec feature.
|
- Updated TOCs for 10.0.7
|
||||||
|
|
||||||
v1.13.17.1:
|
v1.14.16:
|
||||||
|
|
||||||
- Fixed Priests hanging on login on the retail client.
|
- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
|
||||||
|
- Fixed a reported error when playing Darkmoon Faire games.
|
||||||
|
- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
|
||||||
|
|
||||||
v1.13.17:
|
v1.14.15:
|
||||||
|
|
||||||
- Internal maintainability updates. There are so many versions of the game now, updates need to be as easy and safe as possible.
|
- Updated TOCs for 10.0.5
|
||||||
- Improved reliability of Slice-n-Dice predicted length when changing talents.
|
|
||||||
- Improved various modules's ability to respond to the player's maximum power type changing (going from 5 max combo points to 6, for example).
|
v1.14.14:
|
||||||
- Fixed invalid texture layers specified on a variety of textures (10.0 fix).
|
|
||||||
- Removed HolyPowerNumeric text from the configuration options of several modules that it didn't belong with.
|
- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
|
||||||
- Fixed combo points in Classic Era clients.
|
|
||||||
|
v1.14.13:
|
||||||
|
|
||||||
|
- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)
|
||||||
|
|
||||||
|
v1.14.12:
|
||||||
|
|
||||||
|
- Added a module for showing Dragonriding Vigor points.
|
||||||
|
|
||||||
|
v1.14.11:
|
||||||
|
|
||||||
|
- Packaged a new version of LibDogTag-Unit to fix the Guild roster resetting its scroll position every 20 seconds.
|
||||||
|
|
||||||
|
v1.14.10:
|
||||||
|
|
||||||
|
- Fix an error in TargetTargetHealth/Mana and CustomHealth when Low Threshold Color was checked and Scale by Health % was un-checked.
|
||||||
|
|
||||||
|
v1.14.9:
|
||||||
|
|
||||||
|
- Fix Low Threshold to be usable even when Color By Health/Mana % is disabled. (ticket #334)
|
||||||
|
|
||||||
|
v1.14.8:
|
||||||
|
|
||||||
|
- Fix Color By Health % to work with Low Threshold Color option. Previously, if Low Threshold was set, the color was always either MaxHealth/MaxMana or MinHealth/MinMana, it would never be colored by health %. Now if both are set, it will scale by health % until it reaches the low threshold, at which point it will switch to the Min color.
|
||||||
|
- Fix Low Threshold color and flashing to work at the same percentage. Previously these were slightly different such that it would start flashing at 40% but not turn to the Min color until 39.9999%, for example.
|
||||||
|
|
||||||
|
v1.14.7:
|
||||||
|
|
||||||
|
- Add option to scale absorb bar by the unit's maximum health.
|
||||||
|
|
||||||
|
v1.14.6:
|
||||||
|
|
||||||
|
- Add ability for buff/debuff watchers to only display when the specified buff/debuff is missing. This also adds the ability to require that the given unit exists. So if you had Unit set to Target, Display mode set to Missing, and Only if unit exists checked, you'd show the bar if you have a target and they don't have the given buff/debuff.
|
||||||
|
- Don't flash the castbar for instant-cast spells that the player didn't cast (such as internal quest spells).
|
||||||
|
- Add DruidEnergy module (disabled by default). This module will show the player's Energy level if they're a Druid and currently shapeshifted to a non-energy-using form (eligible forms are configurable by the user).
|
||||||
|
|
||||||
|
v1.14.5:
|
||||||
|
|
||||||
|
- Fix castbar flashing. There are controls on the player castbar module for flashing when a spell succeeds or fails, and separate controls for flashing when an instant cast completes. Those were broken, but now work again.
|
||||||
|
- Add "@" after the number when the Combo Points module is in Numeric mode, "Show Charged points" is enabled, and the current combo point is charged.
|
||||||
|
- Fix Charged point support in the ComboPointsBar module.
|
||||||
|
|
||||||
|
v1.14.4:
|
||||||
|
|
||||||
|
- Update TOC for 10.0.2
|
||||||
|
|
||||||
|
v1.14.3:
|
||||||
|
|
||||||
|
- Add Spell ID support for aura tracking.
|
||||||
|
- Add Evoker support.
|
||||||
|
- Add Empowered Casting (hold-to-cast levels) support.
|
||||||
|
|
||||||
|
v1.14.2:
|
||||||
|
|
||||||
|
- Fix CC and Invuln modules not showing immediately when they should.
|
||||||
|
|
||||||
|
v1.14.1:
|
||||||
|
|
||||||
|
- Fix Hide Party feature on pre-10.0 clients.
|
||||||
|
|
||||||
|
v1.14.0:
|
||||||
|
|
||||||
|
- 10.0 compatibility
|
||||||
|
- Renamed Anima Charged combo points to Charged, and removed specific references to Kyrian.
|
||||||
|
Reference in New Issue
Block a user