Compare commits
138 Commits
Author | SHA1 | Date | |
---|---|---|---|
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
|
|||
8858459b10
|
|||
86e40187a2
|
|||
62bcc17ed6
|
|||
52c9b51e8d
|
|||
aa03a0b332
|
|||
3017b5dd18
|
|||
1f54f7d41d
|
|||
5b73d3b35f
|
|||
decb0017f3
|
|||
a32b75bf44
|
|||
6c506579be
|
|||
701fb1373f
|
|||
20d26d8f5e
|
|||
5a41d9a7f4
|
|||
18d827965c
|
|||
c2183f99a0
|
|||
7ceb70737a
|
|||
faa3d326aa
|
|||
9fc90551e2
|
|||
0af47119e3
|
|||
955fa6efdc
|
|||
41ae17ba9a
|
|||
5bc1f04504
|
|||
09e1832fbe
|
|||
7c3fc54d26
|
|||
8972f7eed5
|
|||
9e68edbc43
|
|||
a259db6b8a
|
|||
d10586d477
|
|||
c804ba178b
|
|||
f04c5db493
|
|||
1de917223f
|
|||
fa064dc866
|
|||
ee72cd1f33
|
|||
777cf01174
|
|||
97e81018c7
|
|||
b65909c570
|
|||
b33a82622f
|
|||
96a8fb2c3d
|
|||
6c623d6965
|
|||
d31872512e
|
|||
d424afdab1
|
|||
9500bdf393
|
|||
6325ed1ade
|
|||
a4c44a5809
|
|||
82db70969a
|
|||
47931922bd
|
|||
af74c9e3fe
|
|||
611f37a1f3
|
|||
5d8b83e5ef
|
|||
53fdb48b05
|
|||
b64294ca11
|
|||
0785265feb
|
|||
4007f1258b
|
|||
c7c92d468e
|
|||
eee20f17b4
|
|||
0aa584d81a
|
|||
51e2debc4d
|
|||
d48ae9b12a
|
|||
83028c159f
|
|||
a8a3da753e
|
|||
9e77fa6831 | |||
e4919fb1fe
|
|||
724a3001ed
|
|||
8226679ccd
|
|||
2c0b3d5f6f
|
|||
a08c2455c6
|
|||
8868b16785
|
|||
fc009492cb
|
|||
e2ef8e6cb1
|
|||
da5498d1a2
|
|||
e8c8172298
|
|||
345d12263c
|
|||
843292eda7
|
|||
58721f4fa6
|
|||
ebbddc0001
|
|||
764a097fe2 | |||
60587b22f8
|
|||
ec80716991
|
|||
bc16ae677b
|
|||
dc5a3f3a05
|
|||
6c3ed55780
|
|||
dfcef9617f
|
|||
94b62d56a0
|
|||
90f126d7a0
|
|||
209fbe2b4e
|
|||
9435a9d74f
|
|||
1519ac2299
|
|||
2ba558d73d
|
|||
a3d9c7bd3d | |||
d641886a8a
|
|||
87456ca051
|
|||
d1eae2437f
|
|||
470ca2f592
|
|||
e313e679ae
|
18
.github/workflows/release.yml
vendored
@ -23,6 +23,7 @@ jobs:
|
||||
env:
|
||||
CF_API_KEY: ${{ secrets.CF_API_KEY }}
|
||||
WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
|
||||
WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
|
||||
GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }} # "GITHUB_TOKEN" is a secret always provided to the workflow
|
||||
# for your own token, the name cannot start with "GITHUB_"
|
||||
|
||||
@ -31,20 +32,27 @@ jobs:
|
||||
|
||||
# we first have to clone the AddOn project, this is a required step
|
||||
- name: Clone project
|
||||
uses: actions/checkout@v1
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0 # gets git history for changelogs
|
||||
|
||||
# once cloned, we just run the GitHub Action for the packager project
|
||||
- name: Package and release
|
||||
uses: BigWigsMods/packager@master
|
||||
uses: BigWigsMods/packager@v2
|
||||
|
||||
# another example where we supply additional arguments, this example is specifically to release
|
||||
# for the Classic version of the game
|
||||
- name: Package and release for Classic
|
||||
uses: BigWigsMods/packager@master
|
||||
uses: BigWigsMods/packager@v2
|
||||
with:
|
||||
args: -g classic -w 0
|
||||
|
||||
- name: Package and release for TBC
|
||||
uses: BigWigsMods/packager@master
|
||||
uses: BigWigsMods/packager@v2
|
||||
with:
|
||||
args: -g bc -w 0
|
||||
args: -g bcc -w 0
|
||||
|
||||
- name: Package and release for Wrath
|
||||
uses: BigWigsMods/packager@v2
|
||||
with:
|
||||
args: -g wrath -w 0
|
||||
|
12
.pkgmeta
@ -37,15 +37,18 @@ externals:
|
||||
libs/AceLocale-3.0:
|
||||
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
|
||||
tag: latest
|
||||
libs/AceHook-3.0:
|
||||
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceHook-3.0
|
||||
tag: latest
|
||||
libs/LibRangeCheck-2.0:
|
||||
url: svn://svn.wowace.com/wow/librangecheck-2-0/mainline/trunk/LibRangeCheck-2.0
|
||||
url: https://github.com/WeakAuras/LibRangeCheck-2.0/
|
||||
libs/LibSharedMedia-3.0:
|
||||
url: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk
|
||||
tag: latest
|
||||
libs/LibDogTag-3.0:
|
||||
url: git://git.wowace.com/wow/libdogtag-3-0/mainline.git
|
||||
url: https://github.com/parnic/LibDogTag-3.0
|
||||
libs/LibDogTag-Unit-3.0:
|
||||
url: git://git.wowace.com/wow/libdogtag-unit-3-0/mainline.git
|
||||
url: https://github.com/parnic/LibDogTag-Unit-3.0
|
||||
libs/LibDBIcon-1.0:
|
||||
url: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0
|
||||
libs/LibDualSpec-1.0:
|
||||
@ -58,12 +61,15 @@ optional-dependencies:
|
||||
|
||||
move-folders:
|
||||
IceHUD/IceHUD_Options: IceHUD_Options
|
||||
IceHUD/libs/LibRangeCheck-2.0/LibRangeCheck-2.0: IceHUD/libs/LibRangeCheck-2.0
|
||||
|
||||
tools-used:
|
||||
- libdatabroker-1-1
|
||||
|
||||
ignore:
|
||||
- readme.md
|
||||
- FUNDING.yml
|
||||
- this_version.md
|
||||
|
||||
manual-changelog: this_version.md
|
||||
|
||||
|
3
FUNDING.yml
Normal file
@ -0,0 +1,3 @@
|
||||
github: parnic
|
||||
ko_fi: parnic
|
||||
custom: "https://www.paypal.me/parnic"
|
@ -626,7 +626,7 @@ do
|
||||
v = DogTag:CleanCode(v)
|
||||
end
|
||||
|
||||
self.moduleSettings.upperText = v
|
||||
self.moduleSettings.upperText = strtrim(v)
|
||||
self:RegisterFontStrings()
|
||||
self:Redraw()
|
||||
end,
|
||||
@ -655,7 +655,7 @@ do
|
||||
v = DogTag:CleanCode(v)
|
||||
end
|
||||
|
||||
self.moduleSettings.lowerText = v
|
||||
self.moduleSettings.lowerText = strtrim(v)
|
||||
self:RegisterFontStrings()
|
||||
self:Redraw()
|
||||
end,
|
||||
|
174
IceCastBar.lua
@ -3,7 +3,7 @@ IceCastBar = IceCore_CreateClass(IceBarElement)
|
||||
|
||||
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.actionStartTime = nil
|
||||
@ -13,12 +13,12 @@ IceCastBar.prototype.unit = nil
|
||||
IceCastBar.prototype.current = nil
|
||||
|
||||
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
end
|
||||
|
||||
local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo
|
||||
if IceHUD.WowClassic then
|
||||
if not UnitCastingInfo then
|
||||
UnitCastingInfo = CastingInfo
|
||||
UnitChannelInfo = ChannelInfo
|
||||
end
|
||||
@ -49,6 +49,13 @@ function IceCastBar.prototype:init(name)
|
||||
self:SetDefaultColor("CastChanneling", 242, 242, 10)
|
||||
self:SetDefaultColor("CastSuccess", 242, 242, 70)
|
||||
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.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_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
|
||||
self:Show(false)
|
||||
end
|
||||
@ -146,7 +159,7 @@ function IceCastBar.prototype:GetOptions()
|
||||
end,
|
||||
order = 39.998
|
||||
}
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
opts["showSpellRank"] =
|
||||
{
|
||||
type = 'toggle',
|
||||
@ -311,7 +324,13 @@ function IceCastBar.prototype:PositionIcons()
|
||||
self.barFrame.icon:SetHeight(AuraIconHeight * self.moduleSettings.auraIconScale)
|
||||
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
|
||||
function IceCastBar.prototype:MyOnUpdate()
|
||||
@ -322,17 +341,15 @@ function IceCastBar.prototype:MyOnUpdate()
|
||||
return
|
||||
end
|
||||
|
||||
local time = GetTime()
|
||||
|
||||
self:Update()
|
||||
self:SetTextAlpha()
|
||||
|
||||
-- handle casting and channeling
|
||||
if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel) then
|
||||
local remainingTime = self.actionStartTime + self.actionDuration - time
|
||||
if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel) then
|
||||
local remainingTime = self:GetRemainingCastTime()
|
||||
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
|
||||
end
|
||||
|
||||
@ -343,14 +360,22 @@ function IceCastBar.prototype:MyOnUpdate()
|
||||
end
|
||||
|
||||
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
|
||||
end
|
||||
|
||||
|
||||
-- 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()
|
||||
return
|
||||
end
|
||||
@ -361,13 +386,15 @@ function IceCastBar.prototype:MyOnUpdate()
|
||||
self.action == IceCastBar.Actions.Success or
|
||||
self.action == IceCastBar.Actions.Failure)
|
||||
then
|
||||
local scale = time - self.actionStartTime
|
||||
local scale = GetTime() - self.actionStartTime
|
||||
|
||||
if (scale > 1) then
|
||||
self:StopBar()
|
||||
return
|
||||
end
|
||||
|
||||
self:UpdateBar(1, self:GetCurrentCastingColor())
|
||||
|
||||
if (self.action == IceCastBar.Actions.Failure) then
|
||||
self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
|
||||
else
|
||||
@ -381,12 +408,60 @@ function IceCastBar.prototype:MyOnUpdate()
|
||||
self:StopBar()
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:GetCurrentCastingColor()
|
||||
local updateColor = "CastCasting"
|
||||
if self.action == IceCastBar.Actions.Channel then
|
||||
updateColor = "CastChanneling"
|
||||
function IceCastBar.prototype:GetStageDuration(stage)
|
||||
if not GetUnitEmpowerMinHoldTime then
|
||||
return 0
|
||||
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
|
||||
|
||||
function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
|
||||
@ -405,18 +480,39 @@ function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
|
||||
end
|
||||
|
||||
|
||||
function IceCastBar.prototype:StartBar(action, message)
|
||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
function IceCastBar.prototype:StartBar(action, message, spellId)
|
||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, numStages
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
||||
else
|
||||
spell, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
||||
end
|
||||
if not (spell) then
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
||||
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
|
||||
|
||||
@ -424,7 +520,7 @@ function IceCastBar.prototype:StartBar(action, message)
|
||||
if LibClassicCasterino and not spell then
|
||||
self:StopBar()
|
||||
elseif not spell then
|
||||
return
|
||||
return
|
||||
end
|
||||
|
||||
if icon ~= nil then
|
||||
@ -465,12 +561,13 @@ function IceCastBar.prototype:StopBar()
|
||||
self.actionDuration = nil
|
||||
|
||||
self:SetBottomText1()
|
||||
self:SetBottomText2()
|
||||
self:SetScale(0)
|
||||
self:Show(false)
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:GetShortRank(rank)
|
||||
if IceHUD.WowVer < 80000 and rank then
|
||||
if IceHUD.SpellFunctionsReturnRank and rank then
|
||||
local _, _, sRank = string.find(rank, "(%d+)")
|
||||
if (sRank) then
|
||||
return " (" .. sRank .. ")"
|
||||
@ -499,7 +596,7 @@ function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
|
||||
IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
|
||||
--UnitCastingInfo(unit)
|
||||
|
||||
self:StartBar(IceCastBar.Actions.Cast)
|
||||
self:StartBar(IceCastBar.Actions.Cast, nil, spellId)
|
||||
self.current = castGuid
|
||||
end
|
||||
|
||||
@ -514,11 +611,13 @@ function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
|
||||
|
||||
if (self.action ~= IceCastBar.Actions.Success and
|
||||
self.action ~= IceCastBar.Actions.Failure and
|
||||
self.action ~= IceCastBar.Actions.Channel)
|
||||
self.action ~= IceCastBar.Actions.Channel and
|
||||
self.action ~= IceCastBar.Actions.ReverseChannel)
|
||||
then
|
||||
self:StopBar()
|
||||
self.current = nil
|
||||
end
|
||||
|
||||
self.current = nil
|
||||
end
|
||||
|
||||
|
||||
@ -532,7 +631,7 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
|
||||
end
|
||||
|
||||
-- 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
|
||||
end
|
||||
|
||||
@ -547,7 +646,7 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
|
||||
end
|
||||
end
|
||||
|
||||
self:StartBar(IceCastBar.Actions.Failure, "Failed")
|
||||
self:StartBar(IceCastBar.Actions.Failure, "Failed", nil, spellId)
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
|
||||
@ -561,14 +660,14 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellI
|
||||
|
||||
self.current = nil
|
||||
|
||||
self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
|
||||
self:StartBar(IceCastBar.Actions.Failure, "Interrupted", spellId)
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
--IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit))
|
||||
|
||||
local endTime = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 6 or 5, UnitCastingInfo(self.unit))
|
||||
local endTime = select(IceHUD.SpellFunctionsReturnRank and 6 or 5, UnitCastingInfo(self.unit))
|
||||
|
||||
if (endTime and self.actionStartTime) then
|
||||
-- apparently this check is needed, got nils during a horrible lag spike
|
||||
@ -582,7 +681,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
||||
--IceHUD:Debug("SpellCastSucceeded", unit, castGuid, spellId)
|
||||
|
||||
-- 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
|
||||
end
|
||||
|
||||
@ -595,7 +694,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
||||
|
||||
-- show after normal successfull cast
|
||||
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
|
||||
end
|
||||
|
||||
@ -608,7 +707,12 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
||||
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
|
||||
|
||||
|
||||
@ -629,7 +733,7 @@ function IceCastBar.prototype:SpellCastChannelUpdate(event, unit)
|
||||
--IceHUD:Debug("SpellCastChannelUpdate", unit, UnitChannelInfo(unit))
|
||||
|
||||
local spell, rank, displayName, icon, startTime, endTime
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
||||
else
|
||||
spell, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
||||
|
66
IceCore.lua
@ -41,6 +41,26 @@ IceCore.TextDecorationStyle = {
|
||||
NoDecoration = L["No decoration"],
|
||||
}
|
||||
|
||||
local ZM_MAP_ID = 1970
|
||||
IceCore.zmPuzzleIds = {
|
||||
--Fugueal Protolock
|
||||
366046,
|
||||
366108,
|
||||
359488,
|
||||
--Mezzonic Protolock
|
||||
366042,
|
||||
366106,
|
||||
351405,
|
||||
--Cantaric Protolock
|
||||
365840,
|
||||
366107,
|
||||
348792,
|
||||
}
|
||||
IceCore.zmPuzzleMap = {}
|
||||
for i=1, #IceCore.zmPuzzleIds do
|
||||
IceCore.zmPuzzleMap[IceCore.zmPuzzleIds[i]] = true
|
||||
end
|
||||
|
||||
local SUNDER_SPELL_ID = 7386
|
||||
local LACERATE_SPELL_ID = 33745
|
||||
local MAELSTROM_SPELL_ID = 53817
|
||||
@ -259,7 +279,13 @@ function IceCore.prototype:Enable(userToggle)
|
||||
self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
|
||||
self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
|
||||
end
|
||||
if C_Map then
|
||||
self.IceHUDFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
|
||||
self.IceHUDFrame:RegisterEvent("ZONE_CHANGED")
|
||||
end
|
||||
self.IceHUDFrame:RegisterEvent("UNIT_AURA")
|
||||
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, ...)
|
||||
if (event == "PET_BATTLE_OPENING_START") then
|
||||
if IceHUD.IceCore.settings.bHideDuringPetBattles then
|
||||
@ -279,13 +305,48 @@ function IceCore.prototype:Enable(userToggle)
|
||||
end
|
||||
elseif (event == "UNIT_AURA") then
|
||||
local unit = ...
|
||||
if IceHUD.IceCore.settings.bHideDuringShellGame and unit == "player" and IceHUD:HasDebuffs("player", {271571})[1] and UnitInVehicle("player") then
|
||||
if unit ~= "player" then
|
||||
return
|
||||
end
|
||||
|
||||
if IceHUD.IceCore.settings.bHideDuringShellGame and IceHUD:HasAnyDebuff("player", {IceHUD.ShellGameSpellID}) and UnitInVehicle("player") then
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE")
|
||||
self:Hide()
|
||||
elseif C_Map then
|
||||
local bestMapID = C_Map.GetBestMapForUnit("player")
|
||||
if bestMapID ~= ZM_MAP_ID then
|
||||
return
|
||||
end
|
||||
|
||||
if IceHUD:HasAnyBuff("player", IceCore.zmPuzzleIds) then
|
||||
self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
self:Hide()
|
||||
end
|
||||
end
|
||||
elseif (event == "UNIT_EXITED_VEHICLE") then
|
||||
self:UnregisterEvent("UNIT_EXITED_VEHICLE")
|
||||
self:Show()
|
||||
elseif (event == "PLAYER_ENTERING_WORLD" or event == "ZONE_CHANGED") then
|
||||
if C_Map then
|
||||
local bestMapID = C_Map.GetBestMapForUnit("player")
|
||||
if bestMapID == ZM_MAP_ID then
|
||||
if IceHUD:HasAnyBuff("player", IceCore.zmPuzzleIds) then
|
||||
self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
self:Hide()
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif (event == "COMBAT_LOG_EVENT_UNFILTERED") then
|
||||
local _,subevent,_,_,_,_,_,_,destName,_,_,spellId = CombatLogGetCurrentEventInfo()
|
||||
|
||||
if subevent == "SPELL_AURA_REMOVED" then
|
||||
if destName == UnitName("player") then
|
||||
if IceCore.zmPuzzleMap[spellId] then
|
||||
self:Show()
|
||||
self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
@ -584,10 +645,11 @@ function IceCore.prototype:GetModuleOptions()
|
||||
|
||||
for i = 1, table.getn(self.elements) do
|
||||
local modName = self.elements[i]:GetElementName()
|
||||
local modDesc = self.elements[i]:GetElementDescription()
|
||||
local opt = self.elements[i]:GetOptions()
|
||||
options[modName] = {
|
||||
type = 'group',
|
||||
desc = L["Module options"],
|
||||
desc = modDesc,
|
||||
name = modName,
|
||||
args = opt
|
||||
}
|
||||
|
@ -63,6 +63,10 @@ function IceElement.prototype:GetElementName()
|
||||
return self.elementName
|
||||
end
|
||||
|
||||
function IceElement.prototype:GetElementDescription()
|
||||
return L["Module options"]
|
||||
end
|
||||
|
||||
|
||||
function IceElement.prototype:Create(parent)
|
||||
assert(parent, "IceElement 'parent' can't be nil")
|
||||
|
347
IceHUD.lua
@ -1,5 +1,5 @@
|
||||
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
|
||||
|
||||
@ -7,8 +7,6 @@ local SML = LibStub("LibSharedMedia-3.0")
|
||||
local ACR = LibStub("AceConfigRegistry-3.0")
|
||||
local ConfigDialog = LibStub("AceConfigDialog-3.0")
|
||||
local icon = LibStub("LibDBIcon-1.0", true)
|
||||
local AceGUI = LibStub("AceGUI-3.0")
|
||||
local AceSerializer = LibStub("AceSerializer-3.0", 1)
|
||||
|
||||
local pendingModuleLoads = {}
|
||||
local bReadyToRegisterModules = false
|
||||
@ -17,8 +15,51 @@ IceHUD.CurrTagVersion = 3
|
||||
IceHUD.debugging = false
|
||||
|
||||
IceHUD.WowVer = select(4, GetBuildInfo())
|
||||
IceHUD.WowClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
|
||||
IceHUD.WowClassicBC = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC
|
||||
IceHUD.WowMain = not WOW_PROJECT_ID or WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
|
||||
if GetClassicExpansionLevel then
|
||||
IceHUD.WowClassic = GetClassicExpansionLevel() == 0
|
||||
IceHUD.WowClassicBC = GetClassicExpansionLevel() == 1
|
||||
IceHUD.WowClassicWrath = GetClassicExpansionLevel() == 2
|
||||
else
|
||||
IceHUD.WowClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
|
||||
IceHUD.WowClassicBC = false
|
||||
IceHUD.WowClassicWrath = false
|
||||
if WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
|
||||
if not LE_EXPANSION_LEVEL_CURRENT or LE_EXPANSION_LEVEL_CURRENT == LE_EXPANSION_BURNING_CRUSADE then
|
||||
IceHUD.WowClassicBC = true
|
||||
elseif LE_EXPANSION_LEVEL_CURRENT == LE_EXPANSION_WRATH_OF_THE_LICH_KING then
|
||||
IceHUD.WowClassicWrath = true
|
||||
end
|
||||
elseif WOW_PROJECT_WRATH_CLASSIC and WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC then
|
||||
IceHUD.WowClassicWrath = true
|
||||
end
|
||||
end
|
||||
|
||||
-- compatibility/feature flags
|
||||
IceHUD.GetPlayerAuraBySpellID = _G["C_UnitAuras"] and C_UnitAuras.GetPlayerAuraBySpellID
|
||||
IceHUD.SpellFunctionsReturnRank = IceHUD.WowMain and IceHUD.WowVer < 80000
|
||||
IceHUD.EventExistsPlayerPetChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
|
||||
IceHUD.EventExistsPetBarChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
|
||||
IceHUD.EventExistsPlayerComboPoints = IceHUD.WowMain and IceHUD.WowVer < 30000
|
||||
IceHUD.EventExistsUnitComboPoints = IceHUD.WowMain and IceHUD.WowVer < 70000
|
||||
IceHUD.EventExistsUnitMaxPower = IceHUD.WowMain and IceHUD.WowVer >= 40000
|
||||
IceHUD.EventExistsGroupRosterUpdate = IceHUD.WowVer >= 50000 or not IceHUD.WowMain
|
||||
IceHUD.EventExistsUnitDynamicFlags = IceHUD.WowMain and IceHUD.WowVer < 80000
|
||||
IceHUD.EventExistsUnitHealthFrequent = not IceHUD.WowMain or (IceHUD.WowVer >= 40000 and IceHUD.WowVer < 90000)
|
||||
IceHUD.PerPowerEventsExist = IceHUD.WowMain and IceHUD.WowVer < 40000
|
||||
IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000
|
||||
IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
|
||||
IceHUD.CanTrackGCD = not IceHUD.WowClassic
|
||||
IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
|
||||
IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.WowClassicWrath
|
||||
IceHUD.ShouldUpdateTargetHealthEveryTick = (IceHUD.WowClassic or IceHUD.WowClassicBC) and GetCVarBool("predictedHealth")
|
||||
IceHUD.UsesUIPanelButtonTemplate = IceHUD.WowVer >= 50000 or not IceHUD.WowMain
|
||||
IceHUD.EventExistsSpellcastInterruptible = IceHUD.WowVer >= 30200 and not IceHUD.WowClassicWrath
|
||||
IceHUD.DeathKnightUnholyFrostRunesSwapped = IceHUD.WowVer < 70300 and not IceHUD.WowClassicWrath
|
||||
IceHUD.SupportsHealPrediction = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
|
||||
IceHUD.UnitGroupRolesReturnsRoleString = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
|
||||
IceHUD.ShellGameSpellID = 271571
|
||||
IceHUD.HasShellGame = GetSpellInfo(IceHUD.ShellGameSpellID)
|
||||
|
||||
IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
|
||||
|
||||
@ -26,6 +67,8 @@ IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "Riv
|
||||
"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
|
||||
IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Cooldown bar", Health="Health bar", Mana="Mana bar", CounterBar="Stack count bar"}
|
||||
|
||||
IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
|
||||
|
||||
--@debug@
|
||||
IceHUD.optionsLoaded = true
|
||||
--@end-debug@
|
||||
@ -50,6 +93,43 @@ end
|
||||
|
||||
IceHUD.deepcopy = deepcopy
|
||||
|
||||
function IceHUD:removeDefaults(db, defaults, blocker)
|
||||
-- remove all metatables from the db, so we don't accidentally create new sub-tables through them
|
||||
setmetatable(db, nil)
|
||||
-- loop through the defaults and remove their content
|
||||
for k,v in pairs(defaults) do
|
||||
if type(v) == "table" and type(db[k]) == "table" then
|
||||
-- if a blocker was set, dive into it, to allow multi-level defaults
|
||||
self:removeDefaults(db[k], v, blocker and blocker[k])
|
||||
if next(db[k]) == nil then
|
||||
db[k] = nil
|
||||
end
|
||||
else
|
||||
-- check if the current value matches the default, and that its not blocked by another defaults table
|
||||
if db[k] == defaults[k] and (not blocker or blocker[k] == nil) then
|
||||
db[k] = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function IceHUD:populateDefaults(db, defaults, blocker)
|
||||
-- remove all metatables from the db, so we don't accidentally create new sub-tables through them
|
||||
setmetatable(db, nil)
|
||||
-- loop through the defaults and add their content
|
||||
for k,v in pairs(defaults) do
|
||||
if type(v) == "table" and type(db[k]) == "table" then
|
||||
-- if a blocker was set, dive into it, to allow multi-level defaults
|
||||
self:populateDefaults(db[k], v, blocker and blocker[k])
|
||||
else
|
||||
-- check if the current value matches the default, and that its not blocked by another defaults table
|
||||
if db[k] == nil then
|
||||
db[k] = defaults[k]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
IceHUD.Location = "Interface\\AddOns\\IceHUD"
|
||||
|
||||
StaticPopupDialogs["ICEHUD_CUSTOM_BAR_CREATED"] =
|
||||
@ -325,7 +405,7 @@ end
|
||||
-- blizzard interface options
|
||||
local blizOptionsPanel = CreateFrame("FRAME", "IceHUDConfigPanel", UIParent)
|
||||
blizOptionsPanel.name = "IceHUD"
|
||||
blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, (IceHUD.WowVer >= 50000 or IceHUD.WowClassic) and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
|
||||
blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, IceHUD.UsesUIPanelButtonTemplate and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
|
||||
blizOptionsPanel.button:SetText("Open IceHUD configuration")
|
||||
blizOptionsPanel.button:SetWidth(240)
|
||||
blizOptionsPanel.button:SetHeight(30)
|
||||
@ -415,9 +495,19 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
|
||||
return 0
|
||||
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 name, _, texture, applications
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
else
|
||||
name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
@ -429,7 +519,7 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
|
||||
end
|
||||
|
||||
i = i + 1
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
else
|
||||
name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
@ -449,7 +539,7 @@ do
|
||||
|
||||
local i = 1
|
||||
local name, _, texture, applications, _, _, _, _, _, _, auraID
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
else
|
||||
name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
@ -463,7 +553,7 @@ do
|
||||
end
|
||||
|
||||
i = i + 1
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
else
|
||||
name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
@ -476,6 +566,30 @@ do
|
||||
function IceHUD:HasDebuffs(unit, spellIDs, filter)
|
||||
return IceHUD:HasBuffs(unit, spellIDs, filter and filter.."|HARMFUL" or "HARMFUL")
|
||||
end
|
||||
|
||||
function IceHUD:HasAnyBuff(unit, spellIDs, filter)
|
||||
local buffs = IceHUD:HasBuffs(unit, spellIDs, filter)
|
||||
|
||||
for i=1, #buffs do
|
||||
if buffs[i] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
function IceHUD:HasAnyDebuff(unit, spellIDs, filter)
|
||||
local debuffs = IceHUD:HasDebuffs(unit, spellIDs, filter)
|
||||
|
||||
for i=1, #debuffs do
|
||||
if debuffs[i] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
function IceHUD:OnDisable()
|
||||
@ -615,14 +729,14 @@ function IceHUD:GetIsInLFGGroup()
|
||||
end
|
||||
|
||||
local mode, submode
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if LE_LFG_CATEGORY_LFD then
|
||||
mode, submode = GetLFGMode(LE_LFG_CATEGORY_LFD)
|
||||
else
|
||||
mode, submode = GetLFGMode()
|
||||
end
|
||||
local IsInLFGGroup = CheckLFGMode(mode)
|
||||
|
||||
if IceHUD.WowVer < 50000 then
|
||||
if not LE_LFG_CATEGORY_LFD then
|
||||
return IsInLFGGroup
|
||||
end
|
||||
|
||||
@ -642,31 +756,69 @@ function IceHUD:GetIsInLFGGroup()
|
||||
return IsInLFGGroup
|
||||
end
|
||||
|
||||
local BLACKLISTED_UNIT_MENU_OPTIONS = {
|
||||
SET_FOCUS = "ICEHUD_SET_FOCUS",
|
||||
CLEAR_FOCUS = "ICEHUD_CLEAR_FOCUS",
|
||||
PET_DISMISS = "ICEHUD_PET_DISMISS",
|
||||
LOCK_FOCUS_FRAME = true,
|
||||
UNLOCK_FOCUS_FRAME = true,
|
||||
}
|
||||
local BLACKLISTED_UNIT_MENU_OPTIONS = {}
|
||||
if UnitPopupButtons then
|
||||
BLACKLISTED_UNIT_MENU_OPTIONS = {
|
||||
SET_FOCUS = "ICEHUD_SET_FOCUS",
|
||||
CLEAR_FOCUS = "ICEHUD_CLEAR_FOCUS",
|
||||
LOCK_FOCUS_FRAME = true,
|
||||
UNLOCK_FOCUS_FRAME = true,
|
||||
}
|
||||
if select(2, UnitClass("player")) ~= "WARLOCK" then
|
||||
BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = "ICEHUD_PET_DISMISS"
|
||||
end
|
||||
|
||||
UnitPopupButtons["ICEHUD_SET_FOCUS"] = {
|
||||
text = L["Type %s to set focus"]:format(SLASH_FOCUS1),
|
||||
tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
|
||||
dist = 0,
|
||||
}
|
||||
UnitPopupButtons["ICEHUD_SET_FOCUS"] = {
|
||||
text = L["Type %s to set focus"]:format(SLASH_FOCUS1),
|
||||
tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
|
||||
dist = 0,
|
||||
}
|
||||
|
||||
UnitPopupButtons["ICEHUD_CLEAR_FOCUS"] = {
|
||||
text = L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1),
|
||||
tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
|
||||
dist = 0,
|
||||
}
|
||||
UnitPopupButtons["ICEHUD_CLEAR_FOCUS"] = {
|
||||
text = L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1),
|
||||
tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
|
||||
dist = 0,
|
||||
}
|
||||
|
||||
UnitPopupButtons["ICEHUD_PET_DISMISS"] = {
|
||||
text = L["Use your Dismiss Pet spell to dismiss a pet"],
|
||||
tooltipText = L["Blizzard currently does not provide a proper way to right-click dismiss a pet with custom unit frames."],
|
||||
dist = 0,
|
||||
}
|
||||
UnitPopupButtons["ICEHUD_PET_DISMISS"] = {
|
||||
text = L["Use your Dismiss Pet spell to dismiss a pet"],
|
||||
tooltipText = L["Blizzard currently does not provide a proper way to right-click dismiss a pet with custom unit frames."],
|
||||
dist = 0,
|
||||
}
|
||||
elseif UnitPopupSetFocusButtonMixin then
|
||||
IceHUDUnitPopupSetFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
|
||||
function IceHUDUnitPopupSetFocusButtonMixin:GetText()
|
||||
return L["Type %s to set focus"]:format(SLASH_FOCUS1)
|
||||
end
|
||||
function IceHUDUnitPopupSetFocusButtonMixin:OnClick()
|
||||
end
|
||||
|
||||
IceHUDUnitPopupClearFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
|
||||
function IceHUDUnitPopupClearFocusButtonMixin:GetText()
|
||||
return L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1)
|
||||
end
|
||||
function IceHUDUnitPopupClearFocusButtonMixin:OnClick()
|
||||
end
|
||||
|
||||
IceHUDUnitPopupPetDismissButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
|
||||
function IceHUDUnitPopupPetDismissButtonMixin:GetText()
|
||||
return L["Use your Dismiss Pet spell to dismiss a pet"]
|
||||
end
|
||||
function IceHUDUnitPopupPetDismissButtonMixin:CanShow()
|
||||
return UnitPopupPetDismissButtonMixin:CanShow()
|
||||
end
|
||||
function IceHUDUnitPopupPetDismissButtonMixin:OnClick()
|
||||
end
|
||||
|
||||
BLACKLISTED_UNIT_MENU_OPTIONS[SET_FOCUS] = IceHUDUnitPopupSetFocusButtonMixin
|
||||
BLACKLISTED_UNIT_MENU_OPTIONS[CLEAR_FOCUS] = IceHUDUnitPopupClearFocusButtonMixin
|
||||
BLACKLISTED_UNIT_MENU_OPTIONS[LOCK_FOCUS_FRAME] = true
|
||||
BLACKLISTED_UNIT_MENU_OPTIONS[UNLOCK_FOCUS_FRAME] = true
|
||||
|
||||
if select(2, UnitClass("player")) ~= "WARLOCK" then
|
||||
BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = IceHUDUnitPopupPetDismissButtonMixin
|
||||
end
|
||||
end
|
||||
|
||||
local munged_unit_menus = {}
|
||||
local function munge_unit_menu(menu)
|
||||
@ -687,11 +839,34 @@ local function munge_unit_menu(menu)
|
||||
end
|
||||
|
||||
local found = false
|
||||
local _, v
|
||||
for _, v in ipairs(data) do
|
||||
if BLACKLISTED_UNIT_MENU_OPTIONS[v] then
|
||||
found = true
|
||||
break
|
||||
if data.GetMenuButtons then
|
||||
local btns = data.GetMenuButtons()
|
||||
for i=1, #btns do
|
||||
if btns[i].IsMenu() then
|
||||
local subbtns = btns[i].GetMenuButtons()
|
||||
for j=1, #subbtns do
|
||||
if BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()] then
|
||||
found = true
|
||||
break
|
||||
end
|
||||
end
|
||||
else
|
||||
if BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()] then
|
||||
found = true
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if found then
|
||||
break
|
||||
end
|
||||
end
|
||||
else
|
||||
for _, v in ipairs(data) do
|
||||
if BLACKLISTED_UNIT_MENU_OPTIONS[v] then
|
||||
found = true
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -702,15 +877,42 @@ local function munge_unit_menu(menu)
|
||||
end
|
||||
|
||||
local new_data = {}
|
||||
for _, v in ipairs(data) do
|
||||
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[v]
|
||||
if v == "PET_DISMISS" and select(2, UnitClass("player")) == "WARLOCK" then
|
||||
blacklisted = false
|
||||
if data.GetMenuButtons then
|
||||
local new_buttons_list = {}
|
||||
local btns = data.GetMenuButtons()
|
||||
for i=1, #btns do
|
||||
if btns[i].IsMenu() then
|
||||
local subbtns = btns[i].GetMenuButtons()
|
||||
for j=1, #subbtns do
|
||||
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
|
||||
if not blacklisted then
|
||||
new_buttons_list[#new_buttons_list+1] = subbtns[j]
|
||||
elseif blacklisted ~= true then
|
||||
new_buttons_list[#new_buttons_list+1] = blacklisted
|
||||
end
|
||||
end
|
||||
else
|
||||
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()]
|
||||
if not blacklisted then
|
||||
new_buttons_list[#new_buttons_list+1] = btns[i]
|
||||
elseif blacklisted ~= true then
|
||||
new_buttons_list[#new_buttons_list+1] = blacklisted
|
||||
end
|
||||
end
|
||||
end
|
||||
if not blacklisted then
|
||||
new_data[#new_data+1] = v
|
||||
elseif blacklisted ~= true then
|
||||
new_data[#new_data+1] = blacklisted
|
||||
|
||||
new_data = data
|
||||
function new_data:GetMenuButtons()
|
||||
return new_buttons_list
|
||||
end
|
||||
else
|
||||
for _, v in ipairs(data) do
|
||||
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[v]
|
||||
if not blacklisted then
|
||||
new_data[#new_data+1] = v
|
||||
elseif blacklisted ~= true then
|
||||
new_data[#new_data+1] = blacklisted
|
||||
end
|
||||
end
|
||||
end
|
||||
local new_menu_name = "ICEHUD_" .. menu
|
||||
@ -756,7 +958,6 @@ local function figure_unit_menu(unit)
|
||||
return "PLAYER"
|
||||
end
|
||||
|
||||
IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
|
||||
if UnitPopupFrames then
|
||||
UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
|
||||
end
|
||||
@ -773,3 +974,53 @@ UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()
|
||||
UnitPopup_ShowMenu(IceHUD_UnitFrame_DropDown, menu, IceHUD.DropdownUnit, nil, id)
|
||||
end
|
||||
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
|
||||
|
16
IceHUD.toc
@ -1,7 +1,8 @@
|
||||
## Interface: 90005
|
||||
## Interface-Retail: 90005
|
||||
## Interface-Classic: 11306
|
||||
## Interface-BC: 20501
|
||||
## Interface: 100002
|
||||
## Interface-Retail: 100002
|
||||
## Interface-Classic: 11403
|
||||
## Interface-BCC: 20504
|
||||
## Interface-Wrath: 30400
|
||||
## Author: Parnic, originally created by Iceroth
|
||||
## Name: IceHUD
|
||||
## Title: IceHUD |cff7fff7f-Ace3-|r
|
||||
@ -18,6 +19,7 @@
|
||||
## X-Website: https://www.wowace.com/projects/ice-hud
|
||||
## X-Curse-Project-ID: 5394
|
||||
## X-WoWI-ID: 8149
|
||||
## X-Wago-ID: 5bGolJN0
|
||||
|
||||
#@no-lib-strip@
|
||||
# Libraries
|
||||
@ -97,7 +99,13 @@ modules\Stagger.lua
|
||||
modules\PlayerAltMana.lua
|
||||
modules\ArcaneCharges.lua
|
||||
modules\RollTheBones.lua
|
||||
modules\EssencePower.lua
|
||||
modules\DruidEnergy.lua
|
||||
modules\DragonridingVigor.lua
|
||||
|
||||
#@do-not-package@
|
||||
IceHUD_Options\Json.lua
|
||||
IceHUD_Options\JsonDecode.lua
|
||||
IceHUD_Options\JsonEncode.lua
|
||||
IceHUD_Options\Options.lua
|
||||
#@end-do-not-package@
|
||||
|
@ -1,7 +1,8 @@
|
||||
## Interface: 90005
|
||||
## Interface-Retail: 90005
|
||||
## Interface-Classic: 11306
|
||||
## Interface-BC: 20501
|
||||
## Interface: 100002
|
||||
## Interface-Retail: 100002
|
||||
## Interface-Classic: 11403
|
||||
## Interface-BCC: 20504
|
||||
## Interface-Wrath: 30400
|
||||
## Title: IceHUD |cff7fff7f-Options-|r
|
||||
## Author: Parnic
|
||||
## Version: @project-version@
|
||||
@ -10,4 +11,7 @@
|
||||
## Dependencies: IceHUD
|
||||
## LoadOnDemand: 1
|
||||
|
||||
Json.lua
|
||||
JsonDecode.lua
|
||||
JsonEncode.lua
|
||||
Options.lua
|
||||
|
1
IceHUD_Options/Json.lua
Normal file
@ -0,0 +1 @@
|
||||
IceHUD.json = {}
|
241
IceHUD_Options/JsonDecode.lua
Normal file
@ -0,0 +1,241 @@
|
||||
local parse
|
||||
|
||||
local function create_set(...)
|
||||
local res = {}
|
||||
for i = 1, select("#", ...) do
|
||||
res[select(i, ...)] = true
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
local space_chars = create_set(" ", "\t", "\r", "\n")
|
||||
local delim_chars = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
|
||||
local escape_chars = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
|
||||
local literals = create_set("true", "false", "null")
|
||||
|
||||
local literal_map = {
|
||||
["true"] = true,
|
||||
["false"] = false,
|
||||
["null"] = nil,
|
||||
}
|
||||
|
||||
|
||||
local function next_char(str, idx, set, negate)
|
||||
for i = idx, #str do
|
||||
if set[str:sub(i, i)] ~= negate then
|
||||
return i
|
||||
end
|
||||
end
|
||||
return #str + 1
|
||||
end
|
||||
|
||||
local function decode_error(str, idx, msg)
|
||||
local line_count = 1
|
||||
local col_count = 1
|
||||
for i = 1, idx - 1 do
|
||||
col_count = col_count + 1
|
||||
if str:sub(i, i) == "\n" then
|
||||
line_count = line_count + 1
|
||||
col_count = 1
|
||||
end
|
||||
end
|
||||
|
||||
return string.format("%s at line %d col %d", msg, line_count, col_count)
|
||||
end
|
||||
|
||||
local function codepoint_to_utf8(n)
|
||||
-- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa
|
||||
local f = math.floor
|
||||
if n <= 0x7f then
|
||||
return string.char(n)
|
||||
elseif n <= 0x7ff then
|
||||
return string.char(f(n / 64) + 192, n % 64 + 128)
|
||||
elseif n <= 0xffff then
|
||||
return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128)
|
||||
elseif n <= 0x10ffff then
|
||||
return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128,
|
||||
f(n % 4096 / 64) + 128, n % 64 + 128)
|
||||
end
|
||||
return "", string.format("invalid unicode codepoint '%x'", n)
|
||||
end
|
||||
|
||||
local function parse_unicode_escape(s)
|
||||
local n1 = tonumber(s:sub(1, 4), 16)
|
||||
local n2 = tonumber(s:sub(7, 10), 16)
|
||||
-- Surrogate pair?
|
||||
if n2 then
|
||||
return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
|
||||
else
|
||||
return codepoint_to_utf8(n1)
|
||||
end
|
||||
end
|
||||
|
||||
local function parse_string(str, i)
|
||||
local res = ""
|
||||
local j = i + 1
|
||||
local k = j
|
||||
|
||||
while j <= #str do
|
||||
local x = str:byte(j)
|
||||
|
||||
if x < 32 then
|
||||
return str, j, decode_error(str, j, "control character in string")
|
||||
|
||||
elseif x == 92 then -- `\`: Escape
|
||||
res = res .. str:sub(k, j - 1)
|
||||
j = j + 1
|
||||
local c = str:sub(j, j)
|
||||
if c == "u" then
|
||||
local hex = str:match("^[dD][89aAbB]%x%x\\u%x%x%x%x", j + 1)
|
||||
or str:match("^%x%x%x%x", j + 1)
|
||||
or false
|
||||
if hex == false then
|
||||
return str, j-1, decode_error(str, j - 1, "invalid unicode escape in string")
|
||||
end
|
||||
res = res .. parse_unicode_escape(hex)
|
||||
j = j + #hex
|
||||
else
|
||||
if not escape_chars[c] then
|
||||
return str, j-1, decode_error(str, j - 1, "invalid escape char '" .. c .. "' in string")
|
||||
end
|
||||
res = res .. escape_char_map_inv[c]
|
||||
end
|
||||
k = j + 1
|
||||
|
||||
elseif x == 34 then -- `"`: End of string
|
||||
res = res .. str:sub(k, j - 1)
|
||||
return res, j + 1
|
||||
end
|
||||
|
||||
j = j + 1
|
||||
end
|
||||
|
||||
return str, i, decode_error(str, i, "expected closing quote for string")
|
||||
end
|
||||
|
||||
local function parse_number(str, i)
|
||||
local x = next_char(str, i, delim_chars)
|
||||
local s = str:sub(i, x - 1)
|
||||
local n = tonumber(s)
|
||||
if not n then
|
||||
return -1, -1, decode_error(str, i, "invalid number '" .. s .. "'")
|
||||
end
|
||||
return n, x
|
||||
end
|
||||
|
||||
local function parse_literal(str, i)
|
||||
local x = next_char(str, i, delim_chars)
|
||||
local word = str:sub(i, x - 1)
|
||||
if not literals[word] then
|
||||
return false, -1, decode_error(str, i, "invalid literal '" .. word .. "'")
|
||||
end
|
||||
return literal_map[word], x
|
||||
end
|
||||
|
||||
local function parse_array(str, i)
|
||||
local res = {}
|
||||
local n = 1
|
||||
i = i + 1
|
||||
while 1 do
|
||||
local x
|
||||
i = next_char(str, i, space_chars, true)
|
||||
-- Empty / end of array?
|
||||
if str:sub(i, i) == "]" then
|
||||
i = i + 1
|
||||
break
|
||||
end
|
||||
-- Read token
|
||||
x, i = parse(str, i)
|
||||
res[n] = x
|
||||
n = n + 1
|
||||
-- Next token
|
||||
i = next_char(str, i, space_chars, true)
|
||||
local chr = str:sub(i, i)
|
||||
i = i + 1
|
||||
if chr == "]" then break end
|
||||
if chr ~= "," then return nil, -1, decode_error(str, i, "expected ']' or ','") end
|
||||
end
|
||||
return res, i
|
||||
end
|
||||
|
||||
local function parse_object(str, i)
|
||||
local res = {}
|
||||
i = i + 1
|
||||
while 1 do
|
||||
local key, val
|
||||
i = next_char(str, i, space_chars, true)
|
||||
-- Empty / end of object?
|
||||
if str:sub(i, i) == "}" then
|
||||
i = i + 1
|
||||
break
|
||||
end
|
||||
-- Read key
|
||||
if str:sub(i, i) ~= '"' then
|
||||
return nil, -1, decode_error(str, i, "expected string for key")
|
||||
end
|
||||
key, i = parse(str, i)
|
||||
-- Read ':' delimiter
|
||||
i = next_char(str, i, space_chars, true)
|
||||
if str:sub(i, i) ~= ":" then
|
||||
return nil, -1, decode_error(str, i, "expected ':' after key")
|
||||
end
|
||||
i = next_char(str, i + 1, space_chars, true)
|
||||
-- Read value
|
||||
val, i = parse(str, i)
|
||||
-- Set
|
||||
res[key] = val
|
||||
-- Next token
|
||||
i = next_char(str, i, space_chars, true)
|
||||
local chr = str:sub(i, i)
|
||||
i = i + 1
|
||||
if chr == "}" then break end
|
||||
if chr ~= "," then return nil, -1, decode_error(str, i, "expected '}' or ','") end
|
||||
end
|
||||
return res, i
|
||||
end
|
||||
|
||||
local char_func_map = {
|
||||
['"'] = parse_string,
|
||||
["0"] = parse_number,
|
||||
["1"] = parse_number,
|
||||
["2"] = parse_number,
|
||||
["3"] = parse_number,
|
||||
["4"] = parse_number,
|
||||
["5"] = parse_number,
|
||||
["6"] = parse_number,
|
||||
["7"] = parse_number,
|
||||
["8"] = parse_number,
|
||||
["9"] = parse_number,
|
||||
["-"] = parse_number,
|
||||
["t"] = parse_literal,
|
||||
["f"] = parse_literal,
|
||||
["n"] = parse_literal,
|
||||
["["] = parse_array,
|
||||
["{"] = parse_object,
|
||||
}
|
||||
|
||||
|
||||
parse = function(str, idx)
|
||||
local chr = str:sub(idx, idx)
|
||||
local f = char_func_map[chr]
|
||||
if f then
|
||||
return f(str, idx)
|
||||
end
|
||||
return false, -1, decode_error(str, idx, "unexpected character '" .. chr .. "'")
|
||||
end
|
||||
|
||||
|
||||
function IceHUD.json.decode(str)
|
||||
if type(str) ~= "string" then
|
||||
return nil, "expected argument of type string, got " .. type(str)
|
||||
end
|
||||
local res, idx, err = parse(str, next_char(str, 1, space_chars, true))
|
||||
if err ~= nil then
|
||||
return nil, err
|
||||
end
|
||||
idx = next_char(str, idx, space_chars, true)
|
||||
if idx <= #str then
|
||||
return nil, decode_error(str, idx, "trailing garbage")
|
||||
end
|
||||
return res, nil
|
||||
end
|
100
IceHUD_Options/JsonEncode.lua
Normal file
@ -0,0 +1,100 @@
|
||||
local encode
|
||||
|
||||
local escape_char_map = {
|
||||
["\\"] = "\\",
|
||||
["\""] = "\"",
|
||||
["\b"] = "b",
|
||||
["\f"] = "f",
|
||||
["\n"] = "n",
|
||||
["\r"] = "r",
|
||||
["\t"] = "t",
|
||||
}
|
||||
|
||||
local escape_char_map_inv = { ["/"] = "/" }
|
||||
for k, v in pairs(escape_char_map) do
|
||||
escape_char_map_inv[v] = k
|
||||
end
|
||||
|
||||
|
||||
local function escape_char(c)
|
||||
return "\\" .. (escape_char_map[c] or string.format("u%04x", c:byte()))
|
||||
end
|
||||
|
||||
local function encode_nil(val)
|
||||
return "null"
|
||||
end
|
||||
|
||||
local function encode_table(val, stack)
|
||||
local res = {}
|
||||
stack = stack or {}
|
||||
|
||||
-- Circular reference?
|
||||
if stack[val] then error("circular reference") end
|
||||
|
||||
stack[val] = true
|
||||
|
||||
if rawget(val, 1) ~= nil or next(val) == nil then
|
||||
-- Treat as array -- check keys are valid and it is not sparse
|
||||
local n = 0
|
||||
for k in pairs(val) do
|
||||
if type(k) ~= "number" then
|
||||
error("invalid table: mixed or invalid key types")
|
||||
end
|
||||
n = n + 1
|
||||
end
|
||||
if n ~= #val then
|
||||
error("invalid table: sparse array")
|
||||
end
|
||||
-- Encode
|
||||
for i, v in ipairs(val) do
|
||||
table.insert(res, encode(v, stack))
|
||||
end
|
||||
stack[val] = nil
|
||||
return "[" .. table.concat(res, ",") .. "]"
|
||||
|
||||
else
|
||||
-- Treat as an object
|
||||
for k, v in pairs(val) do
|
||||
if type(k) ~= "string" then
|
||||
error("invalid table: mixed or invalid key types")
|
||||
end
|
||||
table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
|
||||
end
|
||||
stack[val] = nil
|
||||
return "{" .. table.concat(res, ",") .. "}"
|
||||
end
|
||||
end
|
||||
|
||||
local function encode_string(val)
|
||||
return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
|
||||
end
|
||||
|
||||
local function encode_number(val)
|
||||
-- Check for NaN, -inf and inf
|
||||
if val ~= val or val <= -math.huge or val >= math.huge then
|
||||
error("unexpected number value '" .. tostring(val) .. "'")
|
||||
end
|
||||
return string.format("%.14g", val)
|
||||
end
|
||||
|
||||
local type_func_map = {
|
||||
["nil"] = encode_nil,
|
||||
["table"] = encode_table,
|
||||
["string"] = encode_string,
|
||||
["number"] = encode_number,
|
||||
["boolean"] = tostring,
|
||||
}
|
||||
|
||||
|
||||
encode = function(val, stack)
|
||||
local t = type(val)
|
||||
local f = type_func_map[t]
|
||||
if f then
|
||||
return f(val, stack)
|
||||
end
|
||||
error("unexpected type '" .. t .. "'")
|
||||
end
|
||||
|
||||
function IceHUD.json.encode(val)
|
||||
return (encode(val))
|
||||
end
|
@ -1,6 +1,8 @@
|
||||
local LibDualSpec = LibStub('LibDualSpec-1.0', true)
|
||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local icon = LibStub("LibDBIcon-1.0", true)
|
||||
local AceGUI = LibStub("AceGUI-3.0")
|
||||
local AceSerializer = LibStub("AceSerializer-3.0", 1)
|
||||
local lastCustomModule = "Bar"
|
||||
|
||||
IceHUD_Options = {}
|
||||
@ -83,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.
|
||||
|
||||
|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
|
||||
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
|
||||
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.]]
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -421,7 +423,7 @@ The Classic game client doesn't provide this information to addons because it wa
|
||||
IceHUD.IceCore.IceHUDFrame:Show()
|
||||
end
|
||||
end,
|
||||
hidden = IceHUD.WowVer < 80000,
|
||||
hidden = not IceHUD.HasShellGame,
|
||||
order = 36,
|
||||
},
|
||||
}
|
||||
@ -757,6 +759,9 @@ function IceHUD_Options:OnLoad()
|
||||
self:GenerateModuleOptions(true)
|
||||
self.options.args.colors.args = IceHUD.IceCore:GetColorOptions()
|
||||
self.options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(IceHUD.db)
|
||||
--@debug@
|
||||
IceHUD_Options:SetupProfileImportButtons()
|
||||
--@end-debug@
|
||||
|
||||
-- Add dual-spec support
|
||||
if IceHUD.db ~= nil and LibDualSpec then
|
||||
@ -787,14 +792,14 @@ function IceHUD_Options:SetupProfileImportButtons()
|
||||
editbox:SetLabel("Profile")
|
||||
editbox:SetFullWidth(true)
|
||||
editbox:SetFullHeight(true)
|
||||
local profileTable = deepcopy(IceHUD.db.profile)
|
||||
local profileTable = IceHUD.deepcopy(IceHUD.db.profile)
|
||||
IceHUD:removeDefaults(profileTable, IceHUD.IceCore.defaults.profile)
|
||||
editbox:SetText(IceHUD:Serialize(profileTable))
|
||||
editbox:SetText(IceHUD.json.encode(profileTable))
|
||||
editbox:DisableButton(true)
|
||||
frame:AddChild(editbox)
|
||||
end,
|
||||
hidden =
|
||||
-- hello, snooper! this feature doesn't actually work yet, so enabling it won't help you much :)
|
||||
-- hello, snooper! exporting works well enough, but importing is very rough, so enable this at your own peril
|
||||
--[===[@non-debug@
|
||||
true
|
||||
--@end-non-debug@]===]
|
||||
@ -803,7 +808,7 @@ function IceHUD_Options:SetupProfileImportButtons()
|
||||
--@end-debug@
|
||||
,
|
||||
disabled =
|
||||
-- hello, snooper! this feature doesn't actually work yet, so enabling it won't help you much :)
|
||||
-- hello, snooper! exporting works well enough, but importing is very rough, so enable this at your own peril
|
||||
--[===[@non-debug@
|
||||
true
|
||||
--@end-non-debug@]===]
|
||||
@ -824,11 +829,14 @@ function IceHUD_Options:SetupProfileImportButtons()
|
||||
frame:SetStatusText("Exported profile details")
|
||||
frame:SetLayout("Flow")
|
||||
frame:SetCallback("OnClose", function(widget)
|
||||
local success, newTable = IceHUD:Deserialize(widget.children[1]:GetText())
|
||||
if success then
|
||||
local newTable, err = IceHUD.json.decode(widget.children[1]:GetText())
|
||||
if err ~= nil then
|
||||
print("failed to import profile: "..err)
|
||||
else
|
||||
print("importing profile")
|
||||
IceHUD:PreProfileChanged()
|
||||
IceHUD:populateDefaults(newTable, IceHUD.IceCore.defaults.profile)
|
||||
IceHUD.db.profile = deepcopy(newTable)
|
||||
IceHUD.db.profile = IceHUD.deepcopy(newTable)
|
||||
IceHUD:PostProfileChanged()
|
||||
end
|
||||
AceGUI:Release(widget)
|
||||
@ -841,7 +849,7 @@ function IceHUD_Options:SetupProfileImportButtons()
|
||||
frame:AddChild(editbox)
|
||||
end,
|
||||
hidden =
|
||||
-- hello, snooper! this feature doesn't actually work yet, so enabling it won't help you much :)
|
||||
-- hello, snooper! this feature is really rough, so enable it at your own peril
|
||||
--[===[@non-debug@
|
||||
true
|
||||
--@end-non-debug@]===]
|
||||
@ -850,7 +858,7 @@ function IceHUD_Options:SetupProfileImportButtons()
|
||||
--@end-debug@
|
||||
,
|
||||
disabled =
|
||||
-- hello, snooper! this feature doesn't actually work yet, so enabling it won't help you much :)
|
||||
-- hello, snooper! this feature is really rough, so enable it at your own peril
|
||||
--[===[@non-debug@
|
||||
true
|
||||
--@end-non-debug@]===]
|
||||
@ -862,7 +870,3 @@ function IceHUD_Options:SetupProfileImportButtons()
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
--@debug@
|
||||
IceHUD_Options:SetupProfileImportButtons()
|
||||
--@end-debug@
|
||||
|
37
IceHUD_Options/TablePrint.lua
Normal file
@ -0,0 +1,37 @@
|
||||
local function table_print(tt, indent, done)
|
||||
done = done or {}
|
||||
indent = indent or 0
|
||||
if type(tt) == "table" then
|
||||
local sb = {}
|
||||
for key, value in pairs(tt) do
|
||||
table.insert(sb, string.rep(" ", indent)) -- indent it
|
||||
if type(value) == "table" and not done[value] then
|
||||
done[value] = true
|
||||
table.insert(sb, key .. " = {\n");
|
||||
table.insert(sb, table_print(value, indent + 2, done))
|
||||
table.insert(sb, string.rep(" ", indent)) -- indent it
|
||||
table.insert(sb, "}\n");
|
||||
elseif "number" == type(key) then
|
||||
table.insert(sb, string.format("\"%s\"\n", tostring(value)))
|
||||
else
|
||||
table.insert(sb, string.format(
|
||||
"%s = \"%s\"\n", tostring(key), tostring(value)))
|
||||
end
|
||||
end
|
||||
return table.concat(sb)
|
||||
else
|
||||
return tt .. "\n"
|
||||
end
|
||||
end
|
||||
|
||||
local function to_string(tbl)
|
||||
if "nil" == type(tbl) then
|
||||
return tostring(nil)
|
||||
elseif "table" == type(tbl) then
|
||||
return table_print(tbl)
|
||||
elseif "string" == type(tbl) then
|
||||
return tbl
|
||||
else
|
||||
return tostring(tbl)
|
||||
end
|
||||
end
|
@ -52,7 +52,13 @@ function IceStackCounter_GetOptions(frame, opts)
|
||||
opts["auraName"] = {
|
||||
type = 'input',
|
||||
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()
|
||||
return frame.moduleSettings.auraName
|
||||
end,
|
||||
@ -128,7 +134,7 @@ end
|
||||
function IceStackCounter_Enable(frame)
|
||||
frame:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
|
||||
frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsPlayerPetChanged then
|
||||
frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
|
||||
end
|
||||
if FocusUnit then
|
||||
|
@ -20,7 +20,7 @@ IceUnitBar.prototype.hasPet = nil
|
||||
IceUnitBar.prototype.noFlash = nil
|
||||
|
||||
local SPELL_POWER_INSANITY, SPELL_POWER_RAGE = SPELL_POWER_INSANITY, SPELL_POWER_RAGE
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
end
|
||||
@ -87,7 +87,7 @@ function IceUnitBar.prototype:GetOptions()
|
||||
self:Redraw()
|
||||
end,
|
||||
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,
|
||||
min = 0,
|
||||
max = 1,
|
||||
@ -105,10 +105,14 @@ function IceUnitBar.prototype:GetOptions()
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.lowThresholdFlash = v
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
hidden = function()
|
||||
return self.noFlash
|
||||
end,
|
||||
order = 30.092
|
||||
}
|
||||
opts["lowThresholdColor"] = {
|
||||
@ -123,7 +127,7 @@ function IceUnitBar.prototype:GetOptions()
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled or not (self.moduleSettings.scaleHealthColor and self.moduleSettings.scaleManaColor)
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 30.093
|
||||
}
|
||||
@ -278,14 +282,14 @@ function IceUnitBar.prototype:Update()
|
||||
-- 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.
|
||||
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" ]
|
||||
else
|
||||
elseif not self.moduleSettings.scaleHealthColor then
|
||||
self.settings.colors[ "ScaledHealthColor" ] = self.settings.colors[ "MaxHealthColor" ]
|
||||
end
|
||||
if( self.manaPercentage < self.moduleSettings.lowThreshold ) then
|
||||
if( self.manaPercentage <= self.moduleSettings.lowThreshold ) then
|
||||
self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MinManaColor" ]
|
||||
else
|
||||
elseif not self.moduleSettings.scaleManaColor then
|
||||
self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MaxManaColor" ]
|
||||
end
|
||||
end
|
||||
|
21
LICENSE
Normal file
@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2021-2022 parnic
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
170
changelog.md
@ -1,5 +1,175 @@
|
||||
# Changelog
|
||||
|
||||
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:
|
||||
|
||||
- Packaged latest LibDogTag-Unit to work around crash in Wrath Classic client.
|
||||
|
||||
v1.13.17.2:
|
||||
|
||||
- Fixed Runes disappearing for Death Knights on Wrath Classic when using the dual spec feature.
|
||||
|
||||
v1.13.17.1:
|
||||
|
||||
- Fixed Priests hanging on login on the retail client.
|
||||
|
||||
v1.13.17:
|
||||
|
||||
- Internal maintainability updates. There are so many versions of the game now, updates need to be as easy and safe as possible.
|
||||
- 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).
|
||||
- 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 combo points in Classic Era clients.
|
||||
|
||||
v1.13.16:
|
||||
|
||||
- Enabled Incoming Heal Prediction on Wrath-Classic.
|
||||
- Added detection for the full Wrath Classic build (not just the pre-patch).
|
||||
|
||||
v1.13.15:
|
||||
|
||||
- Updated TOC for Retail (9.2.7).
|
||||
- Added Wrath-Classic compatibility.
|
||||
|
||||
v1.13.14.3:
|
||||
|
||||
- Restored right-click menus on Info and Health bars when targeting other players.
|
||||
|
||||
v1.13.14.2:
|
||||
|
||||
- Restored right-click menus on Info and Health bars.
|
||||
|
||||
v1.13.14.1:
|
||||
|
||||
- Restored guard around array that doesn't exist on Classic clients.
|
||||
|
||||
v1.13.14:
|
||||
|
||||
- Fixed target health updating infrequently on Classic.
|
||||
- Fixed compatibility with WoW 9.2.5.
|
||||
- Updated TOC for all game flavors.
|
||||
|
||||
v1.13.13:
|
||||
|
||||
- Slight optimization of Zereth Mortis puzzle detection logic.
|
||||
- Fixed target health updating infrequently on Classic-BC.
|
||||
- Fixed reported error in TargetInvuln module.
|
||||
|
||||
v1.13.12:
|
||||
|
||||
- Hide IceHUD during Zereth Mortis puzzles
|
||||
- Fixed default player and target frames coming back sometimes (github issue #19)
|
||||
- Updated TOC for 9.2.0 and 1.14.2
|
||||
|
||||
v1.13.11:
|
||||
|
||||
- Fixed totem bar dismissal for BC-Classic and Classic
|
||||
- Updated TOC for BC-Clasic
|
||||
|
||||
v1.13.10:
|
||||
|
||||
- Updated TOCs for 9.1.5 and 1.14.1
|
||||
|
||||
v1.13.9:
|
||||
|
||||
- Fixed FocusMana modules attempting to register invalid events in Classic builds.
|
||||
- Add support for multiple anima-charged combo points to display at once.
|
||||
- Update TOC for Classic 1.14.0
|
||||
|
||||
v1.13.8.1:
|
||||
|
||||
- Updated TOC for BC-Classic and Classic.
|
||||
|
||||
v1.13.8:
|
||||
|
||||
- Fixed Paladin GCD not functioning in BC-Classic.
|
||||
|
||||
v1.13.7:
|
||||
|
||||
- Fixed energy ticker when zoning back into an instance after dying (Classic builds)
|
||||
- Added newer Fear spell to CC modules.
|
||||
- Fixed the straight textures (Tanks) not showing the lowest or highest values appropriately (10% could look empty, 90% could look full).
|
||||
|
||||
v1.13.6:
|
||||
|
||||
- Updated TOC to 9.1
|
||||
- Packaged an updated DogTag library with a fix for Classic-era `[Class]` tags.
|
||||
|
||||
v1.13.5:
|
||||
|
||||
- Classic-Burning Crusade support
|
||||
- Package a community fork of LibRangeCheck with BC-Classic compatibility
|
||||
- Prevented DogTag strings sometimes cutting off and showing "..." when they shouldn't if the user entered blank lines in the text box for the tags. Also changed the tooltip to not suggest pressing Enter since that could cause this problem. If you already have blank lines in your DogTag strings, you will want to remove them manually, but this fix prevents the problem from occurring in the future.
|
||||
- Fixed custom buff/debuff bar tracking for targettarget units.
|
||||
|
||||
v1.13.4:
|
||||
|
||||
- Show Demon Hunter Fury top text as the raw Fury amount instead of a 0-100 scale with DogTags off. (ticket #301)
|
||||
|
@ -11,6 +11,7 @@
|
||||
<Include file="libs\AceConsole-3.0\AceConsole-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\AceHook-3.0\AceHook-3.0.xml"/>
|
||||
<Include file="libs\LibDogTag-3.0\lib.xml"/>
|
||||
<Include file="libs\LibDogTag-Unit-3.0\lib.xml"/>
|
||||
<Script file="libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
|
||||
|
@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local ArcaneCharges = IceCore_CreateClass(IceClassPowerCounter)
|
||||
|
||||
local SPELL_POWER_ARCANE_CHARGES = SPELL_POWER_ARCANE_CHARGES
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_ARCANE_CHARGES = Enum.PowerType.ArcaneCharges
|
||||
end
|
||||
|
||||
@ -61,6 +61,6 @@ end
|
||||
|
||||
-- Load us up
|
||||
local _, unitClass = UnitClass("player")
|
||||
if (unitClass == "MAGE" and IceHUD.WowVer >= 70000) then
|
||||
if (unitClass == "MAGE" and MageArcaneChargesFrame) then
|
||||
IceHUD.ArcaneCharges = ArcaneCharges:new()
|
||||
end
|
||||
|
@ -3,6 +3,11 @@ local CastBar = IceCore_CreateClass(IceCastBar)
|
||||
|
||||
local IceHUD = _G.IceHUD
|
||||
|
||||
local CastingBarFrame = CastingBarFrame
|
||||
if not CastingBarFrame then
|
||||
CastingBarFrame = PlayerCastingBarFrame
|
||||
end
|
||||
|
||||
CastBar.prototype.spellCastSent = nil
|
||||
|
||||
-- Constructor --
|
||||
@ -34,6 +39,9 @@ function CastBar.prototype:GetDefaultSettings()
|
||||
settings["rangeColor"] = true
|
||||
settings["bAllowExpand"] = false
|
||||
settings["respectLagTolerance"] = true
|
||||
settings["lockUpperTextAlpha"] = true
|
||||
settings["lockLowerTextAlpha"] = true
|
||||
settings["empowerStageTextDisplay"] = "TOPLINE"
|
||||
|
||||
return settings
|
||||
end
|
||||
@ -231,6 +239,7 @@ function CastBar.prototype:GetOptions()
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.lockUpperTextAlpha = v
|
||||
self.moduleSettings.lockLowerTextAlpha = v
|
||||
self:Redraw()
|
||||
end,
|
||||
order = 13
|
||||
@ -303,7 +312,26 @@ function CastBar.prototype:GetOptions()
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
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.round = ceil
|
||||
IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 }
|
||||
IceClassPowerCounter.prototype.currentGrowMode = nil
|
||||
IceClassPowerCounter.prototype.currentGrowMode = IceClassPowerCounter.prototype.growModes["height"]
|
||||
IceClassPowerCounter.prototype.shouldRegisterDisplayPower = true
|
||||
|
||||
-- Constructor --
|
||||
function IceClassPowerCounter.prototype:init(name)
|
||||
@ -101,7 +102,7 @@ function IceClassPowerCounter.prototype:GetOptions()
|
||||
opts["displayMode"] = {
|
||||
type = 'select',
|
||||
name = L["Display mode"],
|
||||
desc = L["Choose whether you'd like a graphical or numeric representation of the runes.\n\nNOTE: The color of 'Numeric' mode can be controlled by the HolyPowerNumeric color."],
|
||||
desc = L["Choose whether you'd like a graphical or numeric representation of the runes."],
|
||||
get = function(info)
|
||||
return IceHUD:GetSelectValue(info, self.moduleSettings.runeMode)
|
||||
end,
|
||||
@ -391,7 +392,7 @@ function IceClassPowerCounter.prototype:GetDefaultSettings()
|
||||
defaults["hideFriendly"] = false
|
||||
defaults["pulseWhenFull"] = true
|
||||
defaults["overrideAlpha"] = true
|
||||
defaults["numericVerticalOffset"] = 0
|
||||
defaults["numericVerticalOffset"] = -25
|
||||
defaults["alwaysShowNumeric"] = false
|
||||
|
||||
return defaults
|
||||
@ -462,12 +463,21 @@ function IceClassPowerCounter.prototype:CheckValidSpec()
|
||||
end
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:GetPowerEvent()
|
||||
return IceHUD.UnitPowerEvent
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:DisplayCounter()
|
||||
self:UnregisterEvent("PLAYER_LEVEL_UP")
|
||||
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateRunePower")
|
||||
self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
|
||||
self:RegisterEvent(self:GetPowerEvent(), "UpdateRunePower")
|
||||
if self.shouldRegisterDisplayPower then
|
||||
self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
|
||||
end
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateRunePower")
|
||||
end
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
self:HideBlizz()
|
||||
@ -490,15 +500,29 @@ function IceClassPowerCounter.prototype:EnteringWorld()
|
||||
end
|
||||
|
||||
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
|
||||
end
|
||||
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
local numMax = UnitPowerMax(self.unit, self.unitPower)
|
||||
if numMax ~= self.numRunes then
|
||||
local oldMax = self.numRunes
|
||||
self.numRunes = numMax
|
||||
self:CreateFrame()
|
||||
self:SetDisplayMode()
|
||||
|
||||
for i=self.numRunes+1, oldMax do
|
||||
if self.frame.graphical[i] then
|
||||
self.frame.graphical[i]:Hide()
|
||||
end
|
||||
end
|
||||
for i=oldMax+1, self.numRunes do
|
||||
if self:GetRuneMode() ~= "Numeric" then
|
||||
self.frame.graphical[i]:Show()
|
||||
end
|
||||
self:HideRune(i)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -506,10 +530,15 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||
local percentReady = self.shouldShowUnmodified and (UnitPower("player", self.unitPower, true) / self.unmodifiedMaxPerRune) or numReady
|
||||
|
||||
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
|
||||
self.frame.numeric:SetText(format(self.numericFormat, percentReady))
|
||||
self.frame.numeric:SetText(format(self.numericFormat, displayPercent))
|
||||
else
|
||||
self.frame.numeric:SetText(tostring(percentReady))
|
||||
self.frame.numeric:SetText(tostring(displayPercent))
|
||||
end
|
||||
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
||||
end
|
||||
@ -518,7 +547,7 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||
for i=1, self.numRunes do
|
||||
if i <= self.round(percentReady) then
|
||||
if self:GetRuneMode() == "Graphical" then
|
||||
self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
|
||||
self:SetRuneGraphicalTexture(i)
|
||||
else
|
||||
self:SetCustomColor(i)
|
||||
end
|
||||
@ -528,33 +557,14 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||
end
|
||||
|
||||
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
|
||||
if self.numRunes == 1 then
|
||||
currPercent = numReady / UnitPowerMax("player", self.unitPower)
|
||||
end
|
||||
|
||||
if self.currentGrowMode == self.growModes["height"] then
|
||||
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)
|
||||
self:SetRuneCoords(i, currPercent)
|
||||
elseif i > self.lastNumReady then
|
||||
if self.runeCoords ~= nil and #self.runeCoords >= i then
|
||||
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
|
||||
self:SetRuneCoords(i, 1)
|
||||
|
||||
if self.moduleSettings.flashWhenBecomingReady then
|
||||
local fadeInfo={
|
||||
@ -567,11 +577,18 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||
end
|
||||
end
|
||||
else
|
||||
if self.moduleSettings.inactiveDisplayMode == "Darkened" then
|
||||
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
|
||||
elseif self.moduleSettings.inactiveDisplayMode == "Hidden" then
|
||||
self.frame.graphical[i]:Hide()
|
||||
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)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -592,6 +609,40 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||
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
|
||||
left, right, top, bottom = unpack(self.runeCoords[rune])
|
||||
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)
|
||||
if self:GetRuneMode() == "Numeric" then
|
||||
self.frame.graphical[i].Hide()
|
||||
return
|
||||
end
|
||||
|
||||
if self.moduleSettings.inactiveDisplayMode == "Darkened" then
|
||||
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
|
||||
elseif self.moduleSettings.inactiveDisplayMode == "Hidden" then
|
||||
self.frame.graphical[i]:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:StartRunesFullAnimation()
|
||||
if not self.AnimUpdate then
|
||||
self.AnimUpdate = function() self:UpdateRuneAnimation() end
|
||||
@ -662,6 +713,18 @@ function IceClassPowerCounter.prototype:GetShineAtlas(rune)
|
||||
return nil
|
||||
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()
|
||||
IceClassPowerCounter.super.prototype.CreateFrame(self)
|
||||
|
||||
@ -682,6 +745,7 @@ end
|
||||
function IceClassPowerCounter.prototype:SetDisplayMode()
|
||||
if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
|
||||
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
|
||||
self.frame.graphical[i]:Hide()
|
||||
end
|
||||
@ -693,6 +757,21 @@ function IceClassPowerCounter.prototype:SetDisplayMode()
|
||||
for i=1, self.numRunes do
|
||||
self:SetupRuneTexture(i)
|
||||
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
|
||||
@ -707,7 +786,6 @@ function IceClassPowerCounter.prototype:CreateRuneFrame()
|
||||
|
||||
self.frame.numeric:SetJustifyH("CENTER")
|
||||
|
||||
self.frame.numeric:SetPoint("CENTER", self.frame.numericParent, "CENTER", 0, self.moduleSettings.numericVerticalOffset)
|
||||
self.frame.numeric:Hide()
|
||||
|
||||
if (not self.frame.graphical) then
|
||||
@ -717,6 +795,9 @@ function IceClassPowerCounter.prototype:CreateRuneFrame()
|
||||
for i=1, self.numRunes do
|
||||
self:CreateRune(i)
|
||||
end
|
||||
for i=self.numRunes+1, #self.frame.graphical do
|
||||
self.frame.graphical[i]:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:CreateRune(i)
|
||||
@ -725,7 +806,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
||||
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
|
||||
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:SetupRuneTexture(i)
|
||||
|
||||
@ -734,7 +815,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
||||
self.frame.graphical[i].shine:SetAtlas(self:GetShineAtlas(i))
|
||||
else
|
||||
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
|
||||
self.frame.graphical[i].shine:SetBlendMode("ADD")
|
||||
self.frame.graphical[i].shine:ClearAllPoints()
|
||||
@ -744,6 +825,22 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
||||
self.frame.graphical[i].shine:SetHeight(self.runeHeight + 10)
|
||||
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()
|
||||
end
|
||||
|
||||
@ -751,6 +848,10 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
||||
self.frame.graphical[i]:SetHeight(self.runeHeight)
|
||||
self.frame.graphical[i].rune:SetWidth(self.runeWidth)
|
||||
self.frame.graphical[i].rune:SetHeight(self.runeHeight)
|
||||
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
|
||||
self.frame.graphical[i].rune:SetPoint("LEFT", self.frame.graphical[i], "LEFT")
|
||||
else
|
||||
@ -758,7 +859,13 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
||||
end
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:SetupNewRune(rune)
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
|
||||
if rune > #self.runeCoords then
|
||||
self:SetupNewRune(rune)
|
||||
end
|
||||
if not rune or rune < 1 or rune > #self.runeCoords then
|
||||
return
|
||||
end
|
||||
@ -782,12 +889,7 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
|
||||
end
|
||||
|
||||
if self:GetRuneMode() == "Graphical" then
|
||||
local tex = self:GetRuneTexture(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
|
||||
self:SetRuneGraphicalTexture(rune)
|
||||
elseif self:GetRuneMode() == "Graphical Bar" then
|
||||
self.frame.graphical[rune].rune:SetTexture(IceElement.TexturePath .. "Combo")
|
||||
elseif self:GetRuneMode() == "Graphical Circle" then
|
||||
@ -799,6 +901,19 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
|
||||
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()
|
||||
return 0.15
|
||||
end
|
||||
|
@ -4,28 +4,24 @@ local ComboPoints = IceCore_CreateClass(IceElement)
|
||||
local IceHUD = _G.IceHUD
|
||||
|
||||
local AnticipationSpellId = 114015
|
||||
local AnticipationExists = GetSpellInfo(AnticipationSpellId) and IceHUD.WowVer < 70000
|
||||
|
||||
ComboPoints.prototype.comboSize = 20
|
||||
|
||||
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||
end
|
||||
|
||||
local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
|
||||
if not GetUnitChargedPowerPoints then
|
||||
GetUnitChargedPowerPoints = function()
|
||||
return nil
|
||||
end
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function ComboPoints.prototype:init()
|
||||
ComboPoints.super.prototype.init(self, "ComboPoints")
|
||||
|
||||
self:SetDefaultColor("ComboPoints", 1, 1, 0)
|
||||
self:SetDefaultColor("AnticipationPoints", 1, 0, 1)
|
||||
self:SetDefaultColor("KyrianAnimaComboPoint", 0.3137254901960784, 0.3725490196078432, 1)
|
||||
if AnticipationExists then
|
||||
self:SetDefaultColor("AnticipationPoints", 1, 0, 1)
|
||||
end
|
||||
self:SetDefaultColor("ChargedComboPoint", 0.3137254901960784, 0.3725490196078432, 1)
|
||||
self.scalingEnabled = true
|
||||
end
|
||||
|
||||
@ -171,7 +167,7 @@ function ComboPoints.prototype:GetOptions()
|
||||
order = 33.2
|
||||
}
|
||||
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
if AnticipationExists then
|
||||
opts["anticipation"] = {
|
||||
type = "toggle",
|
||||
name = L["Show Anticipation"],
|
||||
@ -226,25 +222,26 @@ function ComboPoints.prototype:GetOptions()
|
||||
order = 35
|
||||
}
|
||||
|
||||
if IceHUD.WowVer >= 90000 then
|
||||
opts["bShowAnimaCharged"] = {
|
||||
type = 'toggle',
|
||||
width = 'double',
|
||||
name = L["Show Anima-charged points"],
|
||||
desc = L["Whether or not to color an anima-charged combo point a separate color. Set the KyrianAnimaComboPoint color to the color you would like it to be."],
|
||||
get = function()
|
||||
return self.moduleSettings.bShowAnimaCharged
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.bShowAnimaCharged = v
|
||||
self:UpdateChargedComboPoints()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 36
|
||||
}
|
||||
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. Set the ChargedComboPoint 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:UpdateChargedComboPoints()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
hidden = function()
|
||||
return not GetUnitChargedPowerPoints
|
||||
end,
|
||||
order = 36
|
||||
}
|
||||
|
||||
return opts
|
||||
end
|
||||
@ -264,7 +261,7 @@ function ComboPoints.prototype:GetDefaultSettings()
|
||||
defaults["comboGap"] = 0
|
||||
defaults["showAnticipation"] = true
|
||||
defaults["bShowWithNoTarget"] = true
|
||||
defaults["bShowAnimaCharged"] = true
|
||||
defaults["bShowCharged"] = true
|
||||
return defaults
|
||||
end
|
||||
|
||||
@ -283,12 +280,12 @@ function ComboPoints.prototype:Enable(core)
|
||||
ComboPoints.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
|
||||
if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
if not IceHUD.EventExistsPlayerComboPoints then
|
||||
if IceHUD.EventExistsUnitComboPoints then
|
||||
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
||||
else
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
|
||||
end
|
||||
end
|
||||
@ -296,7 +293,7 @@ function ComboPoints.prototype:Enable(core)
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
||||
end
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
if AnticipationExists then
|
||||
self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation")
|
||||
self:AddAnticipation()
|
||||
end
|
||||
@ -304,7 +301,7 @@ function ComboPoints.prototype:Enable(core)
|
||||
self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer >= 90000 then
|
||||
if GetUnitChargedPowerPoints then
|
||||
self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
|
||||
end
|
||||
|
||||
@ -327,10 +324,11 @@ function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
|
||||
end
|
||||
|
||||
function ComboPoints.prototype:UpdateChargedComboPoints()
|
||||
local chargedPowerPoints = GetUnitChargedPowerPoints("player")
|
||||
self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
|
||||
self:CreateComboFrame()
|
||||
self:UpdateComboPoints()
|
||||
if GetUnitChargedPowerPoints then
|
||||
self.chargedPowerPoints = GetUnitChargedPowerPoints("player")
|
||||
self:CreateComboFrame()
|
||||
self:UpdateComboPoints()
|
||||
end
|
||||
end
|
||||
|
||||
-- 'Protected' methods --------------------------------------------------------
|
||||
@ -442,8 +440,8 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
||||
g = g - ((1 / maxComboPoints)*i)
|
||||
end
|
||||
|
||||
if i == self.chargedPowerPointIndex and self.moduleSettings.bShowAnimaCharged then
|
||||
self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint"))
|
||||
if self.moduleSettings.bShowCharged and self:IsChargedPoint(i) then
|
||||
self.frame.graphical[i].texture:SetVertexColor(self:GetColor("ChargedComboPoint"))
|
||||
else
|
||||
self.frame.graphical[i].texture:SetVertexColor(r, g, b)
|
||||
end
|
||||
@ -452,7 +450,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
||||
end
|
||||
|
||||
-- create Anticipation points
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if AnticipationExists then
|
||||
for i = 1, 5 do
|
||||
if (not self.frame.graphicalAnt[i]) then
|
||||
local frame = CreateFrame("Frame", nil, self.frame)
|
||||
@ -491,6 +489,20 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
||||
end
|
||||
end
|
||||
|
||||
function ComboPoints.prototype:IsChargedPoint(point)
|
||||
if not self.chargedPowerPoints then
|
||||
return false
|
||||
end
|
||||
|
||||
for i=1, #self.chargedPowerPoints do
|
||||
if self.chargedPowerPoints[i] == point then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
function ComboPoints.prototype:UpdateComboPoints(...)
|
||||
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||
return
|
||||
@ -499,23 +511,23 @@ function ComboPoints.prototype:UpdateComboPoints(...)
|
||||
local points, anticipate, _
|
||||
if IceHUD.IceCore:IsInConfigMode() then
|
||||
points = self:GetMaxComboPoints()
|
||||
elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
elseif UnitHasVehicleUI then
|
||||
-- Parnic: apparently some fights have combo points while the player is in a vehicle?
|
||||
local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
|
||||
local checkUnit = isInVehicle and "vehicle" or "player"
|
||||
if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
|
||||
points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
|
||||
else
|
||||
if IceHUD.PerTargetComboPoints then
|
||||
points = GetComboPoints(checkUnit, "target")
|
||||
else
|
||||
points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
|
||||
end
|
||||
|
||||
if IceHUD.WowVer < 70000 and IceHUD.WowVer >= 50000 then
|
||||
if AnticipationExists then
|
||||
_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||
else
|
||||
anticipate = 0
|
||||
end
|
||||
else
|
||||
points = GetComboPoints("target")
|
||||
points = GetComboPoints("player", "target")
|
||||
end
|
||||
|
||||
points = points or 0
|
||||
@ -533,6 +545,9 @@ function ComboPoints.prototype:UpdateComboPoints(...)
|
||||
self.frame.numeric:SetTextColor(r, g, b, 0.7)
|
||||
|
||||
local pointsText = tostring(points)
|
||||
if self.moduleSettings.bShowCharged and self:IsChargedPoint(points) then
|
||||
pointsText = pointsText.."@"
|
||||
end
|
||||
if anticipate > 0 then
|
||||
pointsText = pointsText.."+"..tostring(anticipate)
|
||||
end
|
||||
@ -577,7 +592,7 @@ do
|
||||
function ComboPoints.prototype:CheckAnticipation(e, unit) -- UNIT_AURA handler
|
||||
if UnitIsUnit(unit, "player") then
|
||||
local _, _, _, newAntStacks
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
_, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||
else
|
||||
_, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||
@ -601,6 +616,6 @@ end
|
||||
|
||||
-- Load us up
|
||||
local _, class = UnitClass("player")
|
||||
if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
|
||||
if (not IceHUD.WowClassic and not IceHUD.WowClassicBC) or class == "ROGUE" or class == "DRUID" then
|
||||
IceHUD.ComboPoints = ComboPoints:new()
|
||||
end
|
||||
|
@ -2,22 +2,16 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local ComboPointsBar = IceCore_CreateClass(IceBarElement)
|
||||
|
||||
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||
end
|
||||
|
||||
local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
|
||||
if not GetUnitChargedPowerPoints then
|
||||
GetUnitChargedPowerPoints = function()
|
||||
return nil
|
||||
end
|
||||
end
|
||||
|
||||
function ComboPointsBar.prototype:init()
|
||||
ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
|
||||
|
||||
self:SetDefaultColor("ComboPointsBarMin", 1, 1, 0)
|
||||
self:SetDefaultColor("ComboPointsBarMax", 0, 1, 0)
|
||||
self:SetDefaultColor("ChargedComboPointBar", 0.3137254901960784, 0.3725490196078432, 1)
|
||||
|
||||
self.bTreatEmptyAsFull = true
|
||||
end
|
||||
@ -59,6 +53,26 @@ function ComboPointsBar.prototype:GetOptions()
|
||||
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
|
||||
end
|
||||
|
||||
@ -69,6 +83,7 @@ function ComboPointsBar.prototype:GetDefaultSettings()
|
||||
defaults.alwaysDisplay = false
|
||||
defaults.desiredLerpTime = 0.05
|
||||
defaults.bShowWithNoTarget = true
|
||||
defaults.bShowCharged = true
|
||||
return defaults
|
||||
end
|
||||
|
||||
@ -76,8 +91,8 @@ function ComboPointsBar.prototype:Enable(core)
|
||||
ComboPointsBar.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
|
||||
if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
if not IceHUD.EventExistsPlayerComboPoints then
|
||||
if IceHUD.EventExistsUnitComboPoints then
|
||||
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
||||
else
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
|
||||
@ -90,17 +105,9 @@ function ComboPointsBar.prototype:Enable(core)
|
||||
self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer >= 90000 then
|
||||
self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
|
||||
if GetUnitChargedPowerPoints then
|
||||
self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateComboPoints")
|
||||
end
|
||||
|
||||
self:UpdateChargedComboPoints()
|
||||
end
|
||||
|
||||
function ComboPointsBar.prototype:UpdateChargedComboPoints()
|
||||
local chargedPowerPoints = GetUnitChargedPowerPoints("player")
|
||||
self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
|
||||
self:UpdateComboPoints()
|
||||
end
|
||||
|
||||
function ComboPointsBar.prototype:CreateFrame()
|
||||
@ -119,35 +126,63 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
|
||||
local points
|
||||
if IceHUD.IceCore:IsInConfigMode() then
|
||||
points = UnitPowerMax("player", SPELL_POWER_COMBO_POINTS)
|
||||
elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
elseif UnitHasVehicleUI then
|
||||
-- Parnic: apparently some fights have combo points while the player is in a vehicle?
|
||||
local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
|
||||
local checkUnit = isInVehicle and "vehicle" or "player"
|
||||
if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
|
||||
points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
|
||||
else
|
||||
if IceHUD.PerTargetComboPoints then
|
||||
points = GetComboPoints(checkUnit, "target")
|
||||
else
|
||||
points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
|
||||
end
|
||||
else
|
||||
points = GetComboPoints("target")
|
||||
points = GetComboPoints("player", "target")
|
||||
end
|
||||
|
||||
if (points == 0) then
|
||||
points = nil
|
||||
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
|
||||
self:Show(self.moduleSettings.alwaysDisplay)
|
||||
self:UpdateBar(0, "undef")
|
||||
else
|
||||
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.barFrame.bar:SetVertexColor(color.r, color.g, color.b, self.alpha)
|
||||
end
|
||||
|
||||
self:SetBottomText1(points or "0")
|
||||
self:SetBottomText2(self.chargedPowerPointIndex)
|
||||
local pointsText = tostring(points or 0)
|
||||
if isCharged then
|
||||
pointsText = pointsText .. "@"
|
||||
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
|
||||
|
||||
function ComboPointsBar.prototype:Update()
|
||||
@ -155,6 +190,6 @@ function ComboPointsBar.prototype:Update()
|
||||
end
|
||||
|
||||
local _, class = UnitClass("player")
|
||||
if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
|
||||
if (not IceHUD.WowClassic and not IceHUD.WowClassicBC) or class == "ROGUE" or class == "DRUID" then
|
||||
IceHUD.ComboPointsBar = ComboPointsBar:new()
|
||||
end
|
||||
|
@ -10,6 +10,7 @@ local buffOrDebuff = {"buff", "debuff"}
|
||||
local validBuffTimers = {"none", "seconds", "minutes:seconds", "minutes"}
|
||||
local AuraIconWidth = 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.auraEndTime = -1
|
||||
@ -19,6 +20,7 @@ IceCustomBar.prototype.bIsAura = false
|
||||
function IceCustomBar.prototype:init()
|
||||
IceCustomBar.super.prototype.init(self, "MyCustomBar", "player")
|
||||
self.textColorOverride = true
|
||||
self.CustomBarUpdateFunc = function() self:UpdateCustomBar(self.unit, true) end
|
||||
end
|
||||
|
||||
-- 'Public' methods -----------------------------------------------------------
|
||||
@ -27,6 +29,16 @@ end
|
||||
function IceCustomBar.prototype:Enable(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
|
||||
DogTag = LibStub("LibDogTag-3.0", true)
|
||||
if DogTag then
|
||||
@ -36,7 +48,7 @@ function IceCustomBar.prototype:Enable(core)
|
||||
|
||||
self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
|
||||
self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsPlayerPetChanged then
|
||||
self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
|
||||
end
|
||||
if FocusUnit then
|
||||
@ -81,7 +93,7 @@ function IceCustomBar.prototype:Disable(core)
|
||||
end
|
||||
|
||||
function IceCustomBar.prototype:GetUnitToTrack()
|
||||
if IceHUD.WowClassic then
|
||||
if not IceHUD.CanTrackOtherUnitBuffs then
|
||||
return "player"
|
||||
end
|
||||
|
||||
@ -107,11 +119,7 @@ end
|
||||
|
||||
function IceCustomBar.prototype:ConditionalSubscribe()
|
||||
if self:ShouldAlwaysSubscribe() then
|
||||
if not IceHUD.IceCore:IsUpdateSubscribed(self) then
|
||||
if not self.CustomBarUpdateFunc then
|
||||
self.CustomBarUpdateFunc = function() self:UpdateCustomBar() end
|
||||
end
|
||||
|
||||
if not IceHUD.IceCore:IsUpdateSubscribed(self, self.CustomBarUpdateFunc) then
|
||||
self.handlesOwnUpdates = true
|
||||
IceHUD.IceCore:RequestUpdates(self, self.CustomBarUpdateFunc)
|
||||
end
|
||||
@ -122,7 +130,7 @@ function IceCustomBar.prototype:ConditionalSubscribe()
|
||||
end
|
||||
|
||||
function IceCustomBar.prototype:ShouldAlwaysSubscribe()
|
||||
return self.unit == "focustarget" or self.unit == "pettarget"
|
||||
return self.unit == "focustarget" or self.unit == "pettarget" or self.unit == "targettarget"
|
||||
end
|
||||
|
||||
function IceCustomBar.prototype:TargetChanged()
|
||||
@ -152,8 +160,7 @@ function IceCustomBar.prototype:GetDefaultSettings()
|
||||
settings["buffOrDebuff"] = "buff"
|
||||
settings["barColor"] = {r=1, g=0, b=0, a=1}
|
||||
settings["trackOnlyMine"] = true
|
||||
settings["displayWhenEmpty"] = false
|
||||
settings["displayWhenTargeting"] = false
|
||||
settings["displayMode"] = displayModes.NORMAL
|
||||
settings["hideAnimationSettings"] = true
|
||||
settings["buffTimerDisplay"] = "minutes"
|
||||
settings["maxDuration"] = 0
|
||||
@ -174,7 +181,7 @@ function IceCustomBar.prototype:CreateBar()
|
||||
IceCustomBar.super.prototype.CreateBar(self)
|
||||
|
||||
if not self.barFrame.icon then
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "BACKGROUND")
|
||||
-- this cuts off the border around the buff icon
|
||||
self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
|
||||
self.barFrame.icon:SetDrawLayer("OVERLAY")
|
||||
@ -262,7 +269,7 @@ function IceCustomBar.prototype:GetOptions()
|
||||
order = 30.3,
|
||||
}
|
||||
|
||||
if not IceHUD.WowClassic then
|
||||
if IceHUD.CanTrackOtherUnitBuffs then
|
||||
opts["unitToTrack"] = {
|
||||
type = 'select',
|
||||
values = validUnits,
|
||||
@ -332,16 +339,18 @@ function IceCustomBar.prototype:GetOptions()
|
||||
opts["buffToTrack"] = {
|
||||
type = 'input',
|
||||
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()
|
||||
return self.moduleSettings.buffToTrack
|
||||
end,
|
||||
set = function(info, 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
|
||||
v = orig
|
||||
end
|
||||
@ -432,38 +441,39 @@ function IceCustomBar.prototype:GetOptions()
|
||||
order = 30.8,
|
||||
}
|
||||
|
||||
opts["displayWhenEmpty"] = {
|
||||
type = 'toggle',
|
||||
name = L["Display when empty"],
|
||||
desc = L["Whether or not to display this bar even if the buff/debuff specified is not present."],
|
||||
get = function()
|
||||
return self.moduleSettings.displayWhenEmpty
|
||||
opts["displayMode"] = {
|
||||
type = 'select',
|
||||
values = displayModes,
|
||||
name = L["Display mode"],
|
||||
desc = L["When to show the bar"],
|
||||
get = function(info)
|
||||
return IceHUD:GetSelectValue(info, self.moduleSettings.displayMode)
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.displayWhenEmpty = v
|
||||
self.moduleSettings.displayMode = info.option.values[v]
|
||||
self:UpdateCustomBar()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 30.9
|
||||
order = 30.9,
|
||||
}
|
||||
|
||||
opts["displayWhenTargeting"] = {
|
||||
opts["displayWhenUnitExists"] = {
|
||||
type = 'toggle',
|
||||
name = L["Display when targeting"],
|
||||
desc = L["Whether to display this bar when you target a unit, even if the buff/debuff specified is not present."],
|
||||
get = function()
|
||||
return self.moduleSettings.displayWhenTargeting
|
||||
name = L["Only if unit exists"],
|
||||
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(info)
|
||||
return self.moduleSettings.displayWhenUnitExists
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.displayWhenTargeting = v
|
||||
self.moduleSettings.displayWhenUnitExists = v
|
||||
self:UpdateCustomBar()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 30.91
|
||||
order = 30.91,
|
||||
}
|
||||
|
||||
opts["buffTimerDisplay"] = {
|
||||
@ -673,7 +683,7 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
|
||||
local isBuff = self.moduleSettings.buffOrDebuff == "buff" and true or false
|
||||
local buffFilter = (isBuff and "HELPFUL" or "HARMFUL") .. (self.moduleSettings.trackOnlyMine and "|PLAYER" or "")
|
||||
local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
else
|
||||
buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
@ -703,7 +713,7 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
else
|
||||
buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
@ -755,7 +765,7 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
|
||||
local auraIcon = nil
|
||||
local endTime = 0
|
||||
|
||||
if not fromUpdate then
|
||||
--if not fromUpdate then
|
||||
if tonumber(self.moduleSettings.buffToTrack) == nil then
|
||||
self.auraDuration, remaining, self.auraBuffCount, auraIcon, endTime =
|
||||
self:GetAuraDuration(self.unit, self.moduleSettings.buffToTrack)
|
||||
@ -790,18 +800,14 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
|
||||
else
|
||||
self.barFrame.icon:Hide()
|
||||
end
|
||||
end
|
||||
--end
|
||||
|
||||
self.auraBuffCount = self.auraBuffCount or 0
|
||||
|
||||
if self.auraEndTime ~= nil and (self.auraEndTime == 0 or self.auraEndTime >= now) and (not self.moduleSettings.minCount or self.auraBuffCount >= self.moduleSettings.minCount) then
|
||||
if not self:ShouldAlwaysSubscribe() and not fromUpdate and not IceHUD.IceCore:IsUpdateSubscribed(self) then
|
||||
if not self.UpdateCustomBarFunc then
|
||||
self.UpdateCustomBarFunc = function() self:UpdateCustomBar(self.unit, true) end
|
||||
end
|
||||
|
||||
if not self:ShouldAlwaysSubscribe() and not fromUpdate and not IceHUD.IceCore:IsUpdateSubscribed(self, self.CustomBarUpdateFunc) then
|
||||
self.handlesOwnUpdates = true
|
||||
IceHUD.IceCore:RequestUpdates(self, self.UpdateCustomBarFunc)
|
||||
IceHUD.IceCore:RequestUpdates(self, self.CustomBarUpdateFunc)
|
||||
end
|
||||
|
||||
self:Show(true)
|
||||
@ -871,9 +877,16 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
|
||||
return
|
||||
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)
|
||||
elseif self.moduleSettings.displayWhenEmpty then
|
||||
elseif self.moduleSettings.displayMode == displayModes.ALWAYS then
|
||||
if not self.bIsVisible then
|
||||
IceCustomBar.super.prototype.Show(self, true)
|
||||
end
|
||||
|
@ -131,7 +131,7 @@ function IceCustomCDBar.prototype:CreateBar()
|
||||
IceCustomCDBar.super.prototype.CreateBar(self)
|
||||
|
||||
if not self.barFrame.icon then
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "BACKGROUND")
|
||||
-- this cuts off the border around the buff icon
|
||||
self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
|
||||
self.barFrame.icon:SetDrawLayer("OVERLAY")
|
||||
|
@ -277,7 +277,7 @@ function IceCustomCounterBar.prototype:CreateFrame()
|
||||
IceCustomCounterBar.super.prototype.CreateFrame(self)
|
||||
|
||||
if not self.barFrame.icon then
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "BACKGROUND")
|
||||
self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
|
||||
self.barFrame.icon:SetDrawLayer("OVERLAY")
|
||||
self.barFrame.icon:Hide()
|
||||
|
@ -144,6 +144,8 @@ function IceCustomHealth.prototype:Update(unit)
|
||||
|
||||
if (self.moduleSettings.scaleHealthColor) then
|
||||
self.color = "ScaledHealthColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||
self.color = "ScaledHealthColor"
|
||||
end
|
||||
|
||||
if (self.tapped) then
|
||||
|
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
@ -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
|
@ -119,7 +119,7 @@ function EclipseBar.prototype:UpdateShown()
|
||||
|
||||
if form == MOONKIN_FORM or not form then
|
||||
local PrimaryTalentTree = 0
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if GetSpecialization then
|
||||
PrimaryTalentTree = GetSpecialization()
|
||||
else
|
||||
PrimaryTalentTree = GetPrimaryTalentTree()
|
||||
@ -190,6 +190,6 @@ function EclipseBar.prototype:MyOnUpdate()
|
||||
end
|
||||
|
||||
local _, unitClass = UnitClass("player")
|
||||
if (unitClass == "DRUID" and IceHUD.WowVer >= 40000 and IceHUD.WowVer < 70000) then
|
||||
if (unitClass == "DRUID" and GetEclipseDirection) then
|
||||
IceHUD.EclipseBar = EclipseBar:new()
|
||||
end
|
||||
|
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
|
||||
self.color = "ScaledHealthColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||
self.color = "ScaledHealthColor"
|
||||
end
|
||||
|
||||
if (self.tapped) then
|
||||
|
@ -4,7 +4,7 @@ local FocusMana = IceCore_CreateClass(IceUnitBar)
|
||||
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||
@ -39,9 +39,9 @@ end
|
||||
function FocusMana.prototype:Enable(core)
|
||||
FocusMana.super.prototype.Enable(self, core)
|
||||
|
||||
if IceHUD.WowVer >= 40000 then
|
||||
if not IceHUD.PerPowerEventsExist then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
@ -88,6 +88,8 @@ function FocusMana.prototype:Update(unit)
|
||||
local color = "FocusMana"
|
||||
if (self.moduleSettings.scaleManaColor) then
|
||||
color = "ScaledManaColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||
color = "ScaledManaColor"
|
||||
end
|
||||
if (manaType == SPELL_POWER_RAGE) then
|
||||
color = "FocusRage"
|
||||
|
@ -165,7 +165,7 @@ function GlobalCoolDown.prototype:GetSpellCastTime(spell)
|
||||
end
|
||||
|
||||
local spellname, castTime, _
|
||||
if IceHUD.WowVer < 60000 then
|
||||
if IceHUD.GetSpellInfoReturnsFunnel then
|
||||
spellName, _, _, _, _, _, castTime = GetSpellInfo(spell)
|
||||
else
|
||||
spellName, _, _, castTime = GetSpellInfo(spell)
|
||||
@ -267,30 +267,35 @@ function GlobalCoolDown.prototype:CreateLagBar()
|
||||
end
|
||||
|
||||
function GlobalCoolDown.prototype:GetSpellId()
|
||||
return 61304
|
||||
--[[
|
||||
local defaultSpells
|
||||
if GetSpellInfo(61304) then
|
||||
return 61304
|
||||
else
|
||||
local defaultSpells
|
||||
|
||||
defaultSpells = {
|
||||
ROGUE=1752, -- sinister strike
|
||||
PRIEST=585, -- smite
|
||||
DRUID=5176, -- wrath
|
||||
WARRIOR=34428, -- victory rush (not available until 5, sadly)
|
||||
MAGE=44614, -- frostfire bolt
|
||||
WARLOCK=686, -- shadow bolt
|
||||
PALADIN=105361, -- seal of command (level 3)
|
||||
SHAMAN=403, -- lightning bolt
|
||||
HUNTER=3044, -- arcane shot
|
||||
DEATHKNIGHT=47541, -- death coil
|
||||
MONK=100780, -- jab
|
||||
}
|
||||
defaultSpells = {
|
||||
ROGUE=1752, -- sinister strike
|
||||
PRIEST=585, -- smite
|
||||
DRUID=5176, -- wrath
|
||||
WARRIOR=34428, -- victory rush (not available until 5, sadly)
|
||||
MAGE=44614, -- frostfire bolt
|
||||
WARLOCK=686, -- shadow bolt
|
||||
PALADIN=105361, -- seal of command (level 3)
|
||||
SHAMAN=403, -- lightning bolt
|
||||
HUNTER=3044, -- arcane shot
|
||||
DEATHKNIGHT=47541, -- death coil
|
||||
MONK=100780, -- jab
|
||||
}
|
||||
|
||||
local _, unitClass = UnitClass("player")
|
||||
return defaultSpells[unitClass]
|
||||
]]
|
||||
if not GetSpellInfo(defaultSpells["PALADIN"]) then
|
||||
defaultSpells["PALADIN"] = 635
|
||||
end
|
||||
|
||||
local _, unitClass = UnitClass("player")
|
||||
return defaultSpells[unitClass]
|
||||
end
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
if not IceHUD.WowClassic then
|
||||
if IceHUD.CanTrackGCD then
|
||||
IceHUD.GlobalCoolDown = GlobalCoolDown:new()
|
||||
end
|
||||
|
@ -2,7 +2,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local HarmonyPower = IceCore_CreateClass(IceClassPowerCounter)
|
||||
|
||||
local SPELL_POWER_CHI = SPELL_POWER_CHI
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if not SPELL_POWER_CHI then
|
||||
SPELL_POWER_CHI = SPELL_POWER_LIGHT_FORCE
|
||||
end
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_CHI = Enum.PowerType.Chi
|
||||
end
|
||||
|
||||
@ -23,11 +26,7 @@ function HarmonyPower.prototype:init()
|
||||
}
|
||||
self.numRunes = 4
|
||||
self.numericColor = "ChiNumeric"
|
||||
if IceHUD.WowVer >= 50100 then
|
||||
self.unitPower = SPELL_POWER_CHI
|
||||
else
|
||||
self.unitPower = SPELL_POWER_LIGHT_FORCE
|
||||
end
|
||||
self.unitPower = SPELL_POWER_CHI
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
self.requiredSpec = SPEC_MONK_WINDWALKER
|
||||
end
|
||||
@ -117,6 +116,6 @@ end
|
||||
|
||||
-- Load us up
|
||||
local _, unitClass = UnitClass("player")
|
||||
if (unitClass == "MONK" and IceHUD.WowVer >= 50000) then
|
||||
if unitClass == "MONK" then
|
||||
IceHUD.HarmonyPower = HarmonyPower:new()
|
||||
end
|
||||
|
@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local HolyPower = IceCore_CreateClass(IceClassPowerCounter)
|
||||
|
||||
local SPELL_POWER_HOLY_POWER = SPELL_POWER_HOLY_POWER
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_HOLY_POWER = Enum.PowerType.HolyPower
|
||||
end
|
||||
|
||||
@ -38,7 +38,7 @@ function HolyPower.prototype:init()
|
||||
self.bTreatEmptyAsFull = true
|
||||
self.unit = "player"
|
||||
self.numRunes = 5
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if HOLY_POWER_FULL then
|
||||
self.numConsideredFull = HOLY_POWER_FULL
|
||||
else
|
||||
self.numConsideredFull = 3
|
||||
@ -134,7 +134,7 @@ end
|
||||
|
||||
-- Load us up
|
||||
local _, unitClass = UnitClass("player")
|
||||
if (unitClass == "PALADIN" and IceHUD.WowVer >= 40000) then
|
||||
if (unitClass == "PALADIN" and (PaladinPowerBar or PaladinPowerBarFrame)) then
|
||||
IceHUD.HolyPower = HolyPower:new()
|
||||
end
|
||||
|
||||
|
@ -42,14 +42,14 @@ function PetHealth.prototype:Enable(core)
|
||||
PetHealth.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PET_UI_UPDATE", "CheckPet");
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsPlayerPetChanged then
|
||||
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
|
||||
end
|
||||
self:RegisterEvent("PET_BAR_UPDATE_USABLE", "CheckPet");
|
||||
self:RegisterEvent("UNIT_PET", "CheckPet");
|
||||
|
||||
self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
|
||||
if IceHUD.WowVer < 90000 then
|
||||
if IceHUD.EventExistsUnitHealthFrequent then
|
||||
self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
|
||||
end
|
||||
self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
|
||||
@ -93,6 +93,8 @@ function PetHealth.prototype:Update(unit)
|
||||
|
||||
if (self.moduleSettings.scaleHealthColor) then
|
||||
color = "ScaledHealthColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||
color = "ScaledHealthColor"
|
||||
end
|
||||
|
||||
if not (self.alive) then
|
||||
|
@ -5,7 +5,7 @@ local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||
local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||
@ -62,15 +62,15 @@ function PetMana.prototype:Enable(core)
|
||||
PetMana.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PET_UI_UPDATE", "CheckPet")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsPlayerPetChanged then
|
||||
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
|
||||
end
|
||||
self:RegisterEvent(IceHUD.WowVer < 80000 and not IceHUD.WowClassic and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet")
|
||||
self:RegisterEvent(IceHUD.EventExistsPetBarChanged and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet")
|
||||
self:RegisterEvent("UNIT_PET", "CheckPet")
|
||||
|
||||
if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
|
||||
if not IceHUD.PerPowerEventsExist then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
@ -173,6 +173,8 @@ function PetMana.prototype:Update(unit)
|
||||
local color = "PetMana"
|
||||
if (self.moduleSettings.scaleManaColor) then
|
||||
color = "ScaledManaColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||
color = "ScaledManaColor"
|
||||
end
|
||||
if not (self.alive) then
|
||||
color = "Dead"
|
||||
|
@ -8,7 +8,7 @@ local _, unitClass = UnitClass("player")
|
||||
|
||||
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||
local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||
end
|
||||
|
@ -1,9 +1,9 @@
|
||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
IceHUDPlayerAlternatePower = IceCore_CreateClass(IceUnitBar)
|
||||
local PlayerAlternatePower = IceCore_CreateClass(IceUnitBar)
|
||||
|
||||
-- Constructor --
|
||||
function IceHUDPlayerAlternatePower.prototype:init(moduleName, unit)
|
||||
IceHUDPlayerAlternatePower.super.prototype.init(self, moduleName or "PlayerAlternatePower", "player")
|
||||
function PlayerAlternatePower.prototype:init(moduleName, unit)
|
||||
PlayerAlternatePower.super.prototype.init(self, moduleName or "PlayerAlternatePower", "player")
|
||||
|
||||
self.bTreatEmptyAsFull = true
|
||||
self.power = 0
|
||||
@ -13,8 +13,8 @@ function IceHUDPlayerAlternatePower.prototype:init(moduleName, unit)
|
||||
self.powerName = "MANA"
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:GetDefaultSettings()
|
||||
local settings = IceHUDPlayerAlternatePower.super.prototype.GetDefaultSettings(self)
|
||||
function PlayerAlternatePower.prototype:GetDefaultSettings()
|
||||
local settings = PlayerAlternatePower.super.prototype.GetDefaultSettings(self)
|
||||
|
||||
settings["side"] = IceCore.Side.Left
|
||||
settings["offset"] = -1
|
||||
@ -25,11 +25,11 @@ function IceHUDPlayerAlternatePower.prototype:GetDefaultSettings()
|
||||
return settings
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:Enable(core)
|
||||
IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
|
||||
function PlayerAlternatePower.prototype:Enable(core)
|
||||
PlayerAlternatePower.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
|
||||
@ -39,40 +39,50 @@ function IceHUDPlayerAlternatePower.prototype:Enable(core)
|
||||
|
||||
if self.maxPower == 0 then
|
||||
self:Show(false)
|
||||
else
|
||||
self.wantToShow = true
|
||||
end
|
||||
if self.moduleSettings.hideBlizz then
|
||||
self:HideBlizz()
|
||||
end
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:PowerBarShow(event, unit)
|
||||
function PlayerAlternatePower.prototype:PowerBarShow(event, unit)
|
||||
if unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
|
||||
self.wantToShow = true
|
||||
self:Show(true)
|
||||
self:Update(self.unit)
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:PowerBarHide(event, unit)
|
||||
function PlayerAlternatePower.prototype:PowerBarHide(event, unit)
|
||||
if unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
|
||||
self.wantToShow = false
|
||||
self:Show(false)
|
||||
self:Update(self.unit)
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:UpdateEvent(event, unit)
|
||||
function PlayerAlternatePower.prototype:UpdateEvent(event, unit)
|
||||
self:Update(unit)
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:Update(unit)
|
||||
IceHUDPlayerAlternatePower.super.prototype.Update(self)
|
||||
function PlayerAlternatePower.prototype:Update(unit)
|
||||
PlayerAlternatePower.super.prototype.Update(self)
|
||||
if (unit and (unit ~= self.unit)) then
|
||||
return
|
||||
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.power = UnitPower(self.unit, self.powerIndex)
|
||||
if self.maxPower > 0 then
|
||||
@ -92,8 +102,8 @@ function IceHUDPlayerAlternatePower.prototype:Update(unit)
|
||||
end
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:GetOptions()
|
||||
local opts = IceHUDPlayerAlternatePower.super.prototype.GetOptions(self)
|
||||
function PlayerAlternatePower.prototype:GetOptions()
|
||||
local opts = PlayerAlternatePower.super.prototype.GetOptions(self)
|
||||
|
||||
opts["lowThresholdColor"] = nil
|
||||
|
||||
@ -121,11 +131,11 @@ function IceHUDPlayerAlternatePower.prototype:GetOptions()
|
||||
return opts
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:ShowBlizz()
|
||||
function PlayerAlternatePower.prototype:ShowBlizz()
|
||||
PlayerPowerBarAlt:GetScript("OnLoad")(PlayerPowerBarAlt)
|
||||
end
|
||||
|
||||
function IceHUDPlayerAlternatePower.prototype:HideBlizz()
|
||||
function PlayerAlternatePower.prototype:HideBlizz()
|
||||
PlayerPowerBarAlt:Hide()
|
||||
|
||||
PlayerPowerBarAlt:UnregisterAllEvents()
|
||||
@ -133,5 +143,5 @@ end
|
||||
|
||||
-- Load us up
|
||||
if ALTERNATE_POWER_INDEX then
|
||||
IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
|
||||
IceHUD.PlayerAlternatePower = PlayerAlternatePower:new()
|
||||
end
|
||||
|
@ -10,6 +10,7 @@ PlayerHealth.prototype.absorbAmount = 0
|
||||
local configMode = false
|
||||
local HealComm
|
||||
local incomingHealAmt = 0
|
||||
local groupEvent = IceHUD.EventExistsGroupRosterUpdate and "GROUP_ROSTER_UPDATE" or "PARTY_MEMBERS_CHANGED"
|
||||
|
||||
-- Constructor --
|
||||
function PlayerHealth.prototype:init()
|
||||
@ -68,7 +69,7 @@ function PlayerHealth.prototype:Enable(core)
|
||||
PlayerHealth.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
|
||||
if IceHUD.WowVer < 90000 then
|
||||
if IceHUD.EventExistsUnitHealthFrequent then
|
||||
self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
|
||||
end
|
||||
self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
|
||||
@ -81,11 +82,7 @@ function PlayerHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("PLAYER_REGEN_DISABLED", "CheckCombat")
|
||||
|
||||
self:RegisterEvent("PARTY_LEADER_CHANGED", "CheckLeader")
|
||||
if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
|
||||
self:RegisterEvent("GROUP_ROSTER_UPDATE", "CheckLeader")
|
||||
else
|
||||
self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckLeader")
|
||||
end
|
||||
self:RegisterEvent(groupEvent, "CheckLeader")
|
||||
if GetLFGProposal then
|
||||
self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
|
||||
@ -105,7 +102,7 @@ function PlayerHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer < 40000 then
|
||||
if not IceHUD.SupportsHealPrediction then
|
||||
HealComm = LibStub("LibHealComm-4.0", true)
|
||||
if HealComm then
|
||||
HealComm.RegisterCallback(self, "HealComm_HealStarted", function(event, casterGUID, spellID, spellType, endTime, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...) end)
|
||||
@ -169,7 +166,7 @@ function PlayerHealth.prototype:HealComm_ModifierChanged(event, guid)
|
||||
end
|
||||
|
||||
function PlayerHealth.prototype:IncomingHealPrediction(event, unit)
|
||||
if IceHUD.WowVer >= 40000 then
|
||||
if IceHUD.SupportsHealPrediction then
|
||||
if unit and unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
@ -321,7 +318,7 @@ function PlayerHealth.prototype:GetOptions()
|
||||
self:Update()
|
||||
end,
|
||||
disabled = function()
|
||||
return not (self.moduleSettings.enabled and (IceHUD.WowVer >= 40000 or HealComm))
|
||||
return not (self.moduleSettings.enabled and (IceHUD.SupportsHealPrediction or HealComm))
|
||||
end,
|
||||
order = 43.6
|
||||
}
|
||||
@ -367,7 +364,7 @@ function PlayerHealth.prototype:GetOptions()
|
||||
self:Update()
|
||||
end,
|
||||
disabled = function()
|
||||
return not (self.moduleSettings.enabled and IceHUD.WowVer >= 70000)
|
||||
return not (self.moduleSettings.enabled and UnitGetTotalAbsorbs)
|
||||
end,
|
||||
order = 43.8
|
||||
}
|
||||
@ -942,7 +939,7 @@ function PlayerHealth.prototype:CreateHealBar()
|
||||
|
||||
self:UpdateBar(1, "undef")
|
||||
|
||||
if not self.moduleSettings.showIncomingHeals or (IceHUD.WowVer < 40000 and not HealComm) then
|
||||
if not self.moduleSettings.showIncomingHeals or (not IceHUD.SupportsHealPrediction and not HealComm) then
|
||||
self.healFrame.bar:Hide()
|
||||
end
|
||||
end
|
||||
@ -954,7 +951,7 @@ function PlayerHealth.prototype:CreateAbsorbBar()
|
||||
|
||||
self:UpdateBar(1, "undef")
|
||||
|
||||
if not self.moduleSettings.showAbsorbs or UnitGetTotalAbsorbs == nil then
|
||||
if not self.moduleSettings.showAbsorbs or not UnitGetTotalAbsorbs then
|
||||
self.absorbFrame.bar:Hide()
|
||||
end
|
||||
end
|
||||
@ -1094,7 +1091,7 @@ function PlayerHealth.prototype:CheckPartyRole()
|
||||
proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||
|
||||
local p = self.unit
|
||||
if IceHUD.WowVer < 40000 then
|
||||
if not IceHUD.UnitGroupRolesReturnsRoleString then
|
||||
isTank, isHeal, isDPS = UnitGroupRolesAssigned(p)
|
||||
else
|
||||
local grpRole = UnitGroupRolesAssigned(p)
|
||||
@ -1279,6 +1276,8 @@ function PlayerHealth.prototype:Update(unit)
|
||||
|
||||
if (self.moduleSettings.scaleHealthColor) then
|
||||
color = "ScaledHealthColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||
color = "ScaledHealthColor"
|
||||
end
|
||||
|
||||
if not (self.alive) then
|
||||
@ -1407,15 +1406,56 @@ end
|
||||
|
||||
|
||||
function PlayerHealth.prototype:ShowBlizz()
|
||||
PlayerFrame:Show()
|
||||
PlayerFrame:GetScript("OnLoad")(PlayerFrame)
|
||||
PlayerFrame:SetParent(self.OriginalPlayerFrameParent or UIParent)
|
||||
end
|
||||
|
||||
|
||||
function PlayerHealth.prototype:HideBlizz()
|
||||
PlayerFrame:Hide()
|
||||
if not self.PlayerFrameParent then
|
||||
self.PlayerFrameParent = CreateFrame("Frame")
|
||||
self.PlayerFrameParent:Hide()
|
||||
end
|
||||
|
||||
PlayerFrame:UnregisterAllEvents()
|
||||
self.OriginalPlayerFrameParent = PlayerFrame:GetParent()
|
||||
PlayerFrame:SetParent(self.PlayerFrameParent)
|
||||
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()
|
||||
@ -1424,37 +1464,34 @@ function PlayerHealth.prototype:HideBlizzardParty()
|
||||
return
|
||||
end
|
||||
|
||||
-- Both Pitbull 4 and Xperl use these exact code, so we use it too.
|
||||
for i = 1, MAX_PARTY_MEMBERS do
|
||||
local party = _G['PartyMemberFrame'..i]
|
||||
party:UnregisterAllEvents()
|
||||
party:Hide()
|
||||
party.Show = function() end
|
||||
if PartyFrame then
|
||||
PartyFrame:Hide()
|
||||
PartyFrame:UnregisterEvent(groupEvent)
|
||||
else
|
||||
for i = 1, MAX_PARTY_MEMBERS do
|
||||
local frame = _G["PartyMemberFrame" .. i]
|
||||
frame:SetAttribute("statehidden", true)
|
||||
hook_frames(frame)
|
||||
end
|
||||
UIParent:UnregisterEvent(groupEvent)
|
||||
end
|
||||
|
||||
UIParent:UnregisterEvent('RAID_ROSTER_UPDATE')
|
||||
|
||||
end
|
||||
|
||||
|
||||
function PlayerHealth.prototype:ShowBlizzardParty()
|
||||
-- Both Pitbull 4 and Xperl use these exact code, so we use it too.
|
||||
for i = 1, MAX_PARTY_MEMBERS do
|
||||
local frame = _G["PartyMemberFrame"..i]
|
||||
if frame then
|
||||
frame.Show = nil
|
||||
frame:GetScript("OnLoad")(frame)
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
frame:GetScript("OnEvent")(frame, "GROUP_ROSTER_UPDATE")
|
||||
else
|
||||
frame:GetScript("OnEvent")(frame, "PARTY_MEMBERS_CHANGED")
|
||||
end
|
||||
|
||||
PartyMemberFrame_UpdateMember(frame)
|
||||
if PartyFrame then
|
||||
PartyFrame:Show()
|
||||
PartyFrame:Layout()
|
||||
PartyFrame:RegisterEvent(groupEvent)
|
||||
else
|
||||
for i = 1, MAX_PARTY_MEMBERS do
|
||||
local frame = _G["PartyMemberFrame" .. i]
|
||||
frame:SetAttribute("statehidden", nil)
|
||||
unhook_frames(frame)
|
||||
frame:GetScript("OnEvent")(frame, groupEvent)
|
||||
end
|
||||
UIParent:RegisterEvent(groupEvent)
|
||||
end
|
||||
|
||||
UIParent:RegisterEvent("RAID_ROSTER_UPDATE")
|
||||
end
|
||||
|
||||
--function PlayerHealth.prototype:ShowBlizzParty()
|
||||
|
@ -115,7 +115,9 @@ end
|
||||
|
||||
function PlayerInfo.prototype:ShowBlizz()
|
||||
BuffFrame:Show()
|
||||
TemporaryEnchantFrame:Show()
|
||||
if TemporaryEnchantFrame then
|
||||
TemporaryEnchantFrame:Show()
|
||||
end
|
||||
|
||||
BuffFrame:GetScript("OnLoad")(BuffFrame)
|
||||
end
|
||||
@ -123,7 +125,9 @@ end
|
||||
|
||||
function PlayerInfo.prototype:HideBlizz()
|
||||
BuffFrame:Hide()
|
||||
TemporaryEnchantFrame:Hide()
|
||||
if TemporaryEnchantFrame then
|
||||
TemporaryEnchantFrame:Hide()
|
||||
end
|
||||
|
||||
BuffFrame:UnregisterAllEvents()
|
||||
end
|
||||
|
@ -13,7 +13,7 @@ local SPELL_POWER_FURY = SPELL_POWER_FURY
|
||||
local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
|
||||
local SPELL_POWER_PAIN = SPELL_POWER_PAIN
|
||||
local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
@ -153,9 +153,9 @@ function PlayerMana.prototype:Enable(core)
|
||||
|
||||
self:CreateTickerFrame()
|
||||
|
||||
if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
|
||||
if not IceHUD.PerPowerEventsExist then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
@ -203,7 +203,7 @@ function PlayerMana.prototype:CheckVehicle()
|
||||
end
|
||||
|
||||
function PlayerMana.prototype:ShouldUseTicker()
|
||||
return IceHUD.WowVer < 30000 or (IceHUD.WowVer < 70100 and not GetCVarBool("predictedPower"))
|
||||
return IceHUD.WowVer < 30000 or (IceHUD.WowVer < 70100 and not GetCVarBool("predictedPower") and not IceHUD.WowClassicWrath)
|
||||
end
|
||||
|
||||
function PlayerMana.prototype:SetupOnUpdate(enable)
|
||||
@ -280,7 +280,7 @@ function PlayerMana.prototype:ManaType(event, unit)
|
||||
|
||||
if self:ShouldUseTicker() then
|
||||
-- register ticker for rogue energy
|
||||
if (self.moduleSettings.tickerEnabled and (self.manaType == SPELL_POWER_ENERGY) and self.alive) then
|
||||
if self.moduleSettings.tickerEnabled and self.manaType == SPELL_POWER_ENERGY then
|
||||
self.tickerFrame:Show()
|
||||
self.tickerFrame:SetScript("OnUpdate", function() self:EnergyTick() end)
|
||||
else
|
||||
@ -344,6 +344,8 @@ function PlayerMana.prototype:Update(unit, powertype)
|
||||
color = "Dead"
|
||||
elseif (self.moduleSettings.scaleManaColor and (UnitPowerType(self.unit) == SPELL_POWER_MANA or self.moduleSettings.scaleManaColorForAll)) then
|
||||
color = "ScaledManaColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||
color = "ScaledManaColor"
|
||||
else
|
||||
if (self.manaType == SPELL_POWER_RAGE) then
|
||||
color = "PlayerRage"
|
||||
@ -353,13 +355,13 @@ function PlayerMana.prototype:Update(unit, powertype)
|
||||
color = "PlayerRunicPower"
|
||||
elseif (self.manaType == SPELL_POWER_FOCUS) then
|
||||
color = "PlayerFocus"
|
||||
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_INSANITY) then
|
||||
elseif (self.manaType == SPELL_POWER_INSANITY) then
|
||||
color = "PlayerInsanity"
|
||||
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_FURY) then
|
||||
elseif (self.manaType == SPELL_POWER_FURY) then
|
||||
color = "PlayerFury"
|
||||
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_MAELSTROM) then
|
||||
elseif (self.manaType == SPELL_POWER_MAELSTROM) then
|
||||
color = "PlayerMaelstrom"
|
||||
elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_PAIN) then
|
||||
elseif (self.manaType == SPELL_POWER_PAIN) then
|
||||
color = "PlayerPain"
|
||||
end
|
||||
end
|
||||
@ -438,7 +440,7 @@ function PlayerMana.prototype:EnergyTick()
|
||||
return
|
||||
end
|
||||
|
||||
if not (self.tickStart) then
|
||||
if not self.tickStart or not self.alive then
|
||||
self.tickerFrame:Hide()
|
||||
return
|
||||
end
|
||||
|
@ -56,7 +56,7 @@ do
|
||||
return
|
||||
end
|
||||
|
||||
self.current = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 15 or 14, UnitAura(self.unit, spellName)) or 0
|
||||
self.current = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, UnitAura(self.unit, spellName)) or 0
|
||||
|
||||
self:Update()
|
||||
end
|
||||
@ -79,7 +79,7 @@ end
|
||||
|
||||
-- Load for tanks only
|
||||
local _, unitClass = UnitClass("player")
|
||||
if ((unitClass == "DEATHKNIGHT" or unitClass == "DRUID" or unitClass == "PALADIN" or unitClass == "WARRIOR" or unitClass == "MONK")
|
||||
and IceHUD.WowVer >= 60000 and IceHUD.WowVer < 70000) then
|
||||
if (unitClass == "DEATHKNIGHT" or unitClass == "DRUID" or unitClass == "PALADIN" or unitClass == "WARRIOR" or unitClass == "MONK")
|
||||
and GetSpellInfo(RESOLVE_SPELL_ID) then
|
||||
IceHUD.Resolve = Resolve:new()
|
||||
end
|
||||
|
@ -22,7 +22,7 @@ for _, v in ipairs(RtBBuffs) do
|
||||
end
|
||||
|
||||
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||
end
|
||||
|
||||
@ -235,7 +235,7 @@ end
|
||||
function RollTheBones.prototype:GetBuffDuration(unitName, ids)
|
||||
local i = 1
|
||||
local buff, _, type, duration, endTime, spellId
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
@ -256,7 +256,7 @@ function RollTheBones.prototype:GetBuffDuration(unitName, ids)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
@ -274,7 +274,7 @@ end
|
||||
function RollTheBones.prototype:MyOnUpdate()
|
||||
RollTheBones.super.prototype.MyOnUpdate(self)
|
||||
if self.bUpdateRtb then
|
||||
self:UpdateRollTheBones(nil, self.unit, true)
|
||||
self:UpdateRollTheBones("internal", self.unit)
|
||||
end
|
||||
if self.target or self.moduleSettings.bShowWithNoTarget then
|
||||
self:UpdateDurationBar()
|
||||
@ -296,13 +296,14 @@ local function ShouldHide()
|
||||
return not HasSpell(193316)
|
||||
end
|
||||
|
||||
function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
|
||||
function RollTheBones.prototype:UpdateRollTheBones(event, unit)
|
||||
if unit and unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
|
||||
local now = GetTime()
|
||||
local remaining = nil
|
||||
local fromUpdate = event == "internal"
|
||||
|
||||
if not fromUpdate then
|
||||
rtbDuration, remaining, rtbCount = self:GetBuffDuration(self.unit, RtBSet)
|
||||
@ -376,14 +377,18 @@ function RollTheBones.prototype:UpdateDurationBar(event, unit)
|
||||
end
|
||||
|
||||
local points = RTBGetComboPoints(self.unit)
|
||||
-- check for Deeper Stratagem
|
||||
local _, _, _, DeeperStratagem = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
|
||||
|
||||
if DeeperStratagem then
|
||||
-- first, set the cached upper limit of RtB duration
|
||||
CurrMaxRtBDuration = self:GetMaxBuffTime(maxComboPoints + 1)
|
||||
if UnitPowerMax then
|
||||
CurrMaxRtBDuration = self:GetMaxBuffTime(UnitPowerMax(self.unit, SPELL_POWER_COMBO_POINTS))
|
||||
else
|
||||
CurrMaxRtBDuration = self:GetMaxBuffTime(maxComboPoints)
|
||||
-- check for Deeper Stratagem
|
||||
local _, _, _, DeeperStratagem = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
|
||||
|
||||
if DeeperStratagem then
|
||||
-- first, set the cached upper limit of RtB duration
|
||||
CurrMaxRtBDuration = self:GetMaxBuffTime(maxComboPoints + 1)
|
||||
else
|
||||
CurrMaxRtBDuration = self:GetMaxBuffTime(maxComboPoints)
|
||||
end
|
||||
end
|
||||
|
||||
if event then
|
||||
|
@ -3,21 +3,23 @@ local Runes = IceCore_CreateClass(IceElement)
|
||||
|
||||
local IceHUD = _G.IceHUD
|
||||
|
||||
local RunesReturnedByMaxPower = IceHUD.WowVer >= 70000
|
||||
|
||||
local CooldownFrame_SetTimer = CooldownFrame_SetTimer
|
||||
if CooldownFrame_Set then
|
||||
CooldownFrame_SetTimer = CooldownFrame_Set
|
||||
end
|
||||
|
||||
local RUNETYPE_BLOOD = 1;
|
||||
local RUNETYPE_DEATH = IceHUD.WowVer < 70300 and 2 or 3;
|
||||
local RUNETYPE_FROST = IceHUD.WowVer < 70300 and 3 or 2;
|
||||
local RUNETYPE_DEATH = IceHUD.DeathKnightUnholyFrostRunesSwapped and 2 or 3;
|
||||
local RUNETYPE_FROST = IceHUD.DeathKnightUnholyFrostRunesSwapped and 3 or 2;
|
||||
local RUNETYPE_CHROMATIC = 4;
|
||||
local RUNETYPE_LEGION = 5; -- not real, but makes for an easy update
|
||||
|
||||
local GetRuneType = GetRuneType
|
||||
if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 70300 then
|
||||
GetRuneType = function() return RUNETYPE_LEGION end
|
||||
elseif IceHUD.WowVer >= 70300 then
|
||||
elseif IceHUD.WowVer >= 70300 and GetSpecialization then
|
||||
GetRuneType = function() return GetSpecialization() end
|
||||
end
|
||||
|
||||
@ -44,7 +46,7 @@ Runes.prototype.numRunes = 6
|
||||
Runes.prototype.lastRuneState = {}
|
||||
|
||||
local SPELL_POWER_RUNES = SPELL_POWER_RUNES
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_RUNES = Enum.PowerType.Runes
|
||||
end
|
||||
|
||||
@ -132,6 +134,9 @@ function Runes.prototype:GetOptions()
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
hidden = function()
|
||||
return not PlayerFrame_HideVehicleTexture
|
||||
end,
|
||||
order = 32
|
||||
}
|
||||
|
||||
@ -265,7 +270,7 @@ end
|
||||
|
||||
-- OVERRIDE
|
||||
function Runes.prototype:Enable(core)
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
if RunesReturnedByMaxPower then
|
||||
self.numRunes = UnitPowerMax("player", SPELL_POWER_RUNES)
|
||||
end
|
||||
|
||||
@ -283,7 +288,9 @@ function Runes.prototype:Enable(core)
|
||||
self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", "UpdateRuneColors")
|
||||
end
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
|
||||
if RunesReturnedByMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
|
||||
end
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
self:HideBlizz()
|
||||
@ -503,7 +510,7 @@ function Runes.prototype:CreateRune(i, type, name)
|
||||
-- create runes
|
||||
if (not self.frame.graphical[i]) then
|
||||
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
|
||||
self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "LOW")
|
||||
self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "BACKGROUND")
|
||||
self.frame.graphical[i].rune:SetAllPoints(self.frame.graphical[i])
|
||||
self.frame.graphical[i].cd = CreateFrame("Cooldown", nil, self.frame.graphical[i], "CooldownFrameTemplate")
|
||||
self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
|
||||
@ -577,6 +584,10 @@ local function hook_playerframe()
|
||||
end
|
||||
|
||||
function Runes.prototype:HideBlizz()
|
||||
if not PlayerFrame_HideVehicleTexture then
|
||||
return
|
||||
end
|
||||
|
||||
RuneFrame:Hide()
|
||||
RuneFrame:UnregisterAllEvents()
|
||||
|
||||
|
@ -38,7 +38,7 @@ local DemonologyCoords =
|
||||
}
|
||||
|
||||
local SPELL_POWER_SOUL_SHARDS = SPELL_POWER_SOUL_SHARDS
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards
|
||||
end
|
||||
|
||||
@ -131,7 +131,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
|
||||
|
||||
self.shouldShowUnmodified = false
|
||||
self.requiredSpec = CurrentSpec
|
||||
self.currentGrowMode = nil
|
||||
self.currentGrowMode = self.growModes["height"]
|
||||
|
||||
if CurrentSpec == SPEC_WARLOCK_AFFLICTION then
|
||||
self.runeCoords = AfflictionCoords
|
||||
@ -276,6 +276,6 @@ end
|
||||
|
||||
-- Load us up
|
||||
local _, unitClass = UnitClass("player")
|
||||
if (unitClass == "WARLOCK" and IceHUD.WowVer >= 40000) then
|
||||
if (unitClass == "WARLOCK" and WarlockPowerFrame) then
|
||||
IceHUD.ShardCounter = ShardCounter:new()
|
||||
end
|
||||
|
@ -25,6 +25,11 @@ local sixComboPointsTalentID = 19240
|
||||
local CurrMaxSnDDuration = 0
|
||||
local PotentialSnDDuration = 0
|
||||
|
||||
local sndBuffName = 132306
|
||||
if IceHUD.WowMain and IceHUD.WowVer < 80000 then
|
||||
sndBuffName = "Ability_Rogue_SliceDice"
|
||||
end
|
||||
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
baseTime = 12
|
||||
gapPerComboPoint = 6
|
||||
@ -33,10 +38,18 @@ if IceHUD.WowClassic then
|
||||
impSndBonusPerRank = 0.15
|
||||
impSndTalentPage = 1
|
||||
impSndTalentIdx = 6
|
||||
elseif IceHUD.WowClassicBC then
|
||||
impSndBonusPerRank = 0.15
|
||||
impSndTalentPage = 2
|
||||
impSndTalentIdx = 4
|
||||
elseif IceHUD.WowClassicWrath then
|
||||
impSndBonusPerRank = 0.25
|
||||
impSndTalentPage = 2
|
||||
impSndTalentIdx = 23
|
||||
end
|
||||
|
||||
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||
if IceHUD.WowVer >= 80000 then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||
end
|
||||
|
||||
@ -61,7 +74,7 @@ function SliceAndDice.prototype:Enable(core)
|
||||
SliceAndDice.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice")
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsUnitComboPoints then
|
||||
self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
|
||||
else
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
|
||||
@ -72,6 +85,10 @@ function SliceAndDice.prototype:Enable(core)
|
||||
self:CheckMaxComboPoints()
|
||||
end
|
||||
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxComboPoints")
|
||||
end
|
||||
|
||||
if not self.moduleSettings.alwaysFullAlpha then
|
||||
self:Show(false)
|
||||
else
|
||||
@ -82,8 +99,12 @@ function SliceAndDice.prototype:Enable(core)
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:CheckMaxComboPoints()
|
||||
local talentID, name, texture, selected, available, spellID, unknown, row, column, known, grantedByAura = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
|
||||
maxComboPoints = selected and 6 or 5
|
||||
if UnitPowerMax then
|
||||
maxComboPoints = UnitPowerMax(self.unit, SPELL_POWER_COMBO_POINTS)
|
||||
else
|
||||
local talentID, name, texture, selected, available, spellID, unknown, row, column, known, grantedByAura = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
|
||||
maxComboPoints = selected and 6 or 5
|
||||
end
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:Disable(core)
|
||||
@ -227,7 +248,7 @@ end
|
||||
function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
|
||||
local i = 1
|
||||
local buff, _, texture, duration, endTime, remaining
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
@ -243,7 +264,7 @@ function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
@ -256,7 +277,7 @@ end
|
||||
function SliceAndDice.prototype:MyOnUpdate()
|
||||
SliceAndDice.super.prototype.MyOnUpdate(self)
|
||||
if self.bUpdateSnd then
|
||||
self:UpdateSliceAndDice(nil, self.unit, true)
|
||||
self:UpdateSliceAndDice("internal", self.unit)
|
||||
end
|
||||
if self.target or self.moduleSettings.bShowWithNoTarget then
|
||||
self:UpdateDurationBar()
|
||||
@ -264,10 +285,10 @@ function SliceAndDice.prototype:MyOnUpdate()
|
||||
end
|
||||
|
||||
local function SNDGetComboPoints(unit)
|
||||
if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
|
||||
return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
|
||||
elseif IceHUD.WowVer >= 30000 then
|
||||
if IceHUD.PerTargetComboPoints then
|
||||
return GetComboPoints(unit, "target")
|
||||
elseif IceHUD.WowVer >= 60000 then
|
||||
return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
|
||||
else
|
||||
return GetComboPoints()
|
||||
end
|
||||
@ -281,7 +302,7 @@ local function HasSpell(id)
|
||||
end
|
||||
|
||||
local function ShouldHide()
|
||||
if IceHUD.WowVer >= 90000 then
|
||||
if IceHUD.WowVer >= 90000 or IceHUD.WowClassicBC or IceHUD.WowClassicWrath then
|
||||
return false
|
||||
end
|
||||
|
||||
@ -291,16 +312,17 @@ local function ShouldHide()
|
||||
-- with different durations
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
|
||||
function SliceAndDice.prototype:UpdateSliceAndDice(event, unit)
|
||||
if unit and unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
|
||||
local now = GetTime()
|
||||
local remaining = nil
|
||||
local fromUpdate = event == "internal"
|
||||
|
||||
if not fromUpdate or IceHUD.WowVer < 30000 then
|
||||
sndDuration, remaining = self:GetBuffDuration(self.unit, (IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and "Ability_Rogue_SliceDice" or 132306)
|
||||
sndDuration, remaining = self:GetBuffDuration(self.unit, sndBuffName)
|
||||
|
||||
if not remaining then
|
||||
sndEndTime = 0
|
||||
@ -402,13 +424,11 @@ function SliceAndDice.prototype:UpdateDurationBar(event, unit)
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:GetMaxBuffTime(numComboPoints)
|
||||
local maxduration
|
||||
|
||||
if numComboPoints == 0 then
|
||||
return 0
|
||||
end
|
||||
|
||||
maxduration = baseTime + ((numComboPoints - 1) * gapPerComboPoint)
|
||||
local maxduration = baseTime + ((numComboPoints - 1) * gapPerComboPoint)
|
||||
|
||||
if self:HasNetherbladeBonus() then
|
||||
maxduration = maxduration + netherbladeBonus
|
||||
|
@ -185,13 +185,13 @@ function StaggerBar.prototype:GetDebuffInfo()
|
||||
local staggerLevel = 1
|
||||
|
||||
for i = 1, IceCore.BuffLimit do
|
||||
local debuffID = select(IceHUD.WowVer < 80000 and 11 or 10, UnitDebuff(self.unit, i))
|
||||
local debuffID = select(IceHUD.SpellFunctionsReturnRank and 11 or 10, UnitDebuff(self.unit, i))
|
||||
|
||||
if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
|
||||
local spellName = UnitDebuff(self.unit, i)
|
||||
|
||||
duration = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||
amount = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||
duration = select(IceHUD.SpellFunctionsReturnRank and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||
amount = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||
staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
|
||||
|
||||
break
|
||||
@ -236,7 +236,7 @@ end
|
||||
|
||||
function StaggerBar.prototype:GetDebuffDuration(unitName, buffId)
|
||||
local name, _, duration, endTime
|
||||
if IceHUD.WowVer < 80000 then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
|
||||
else
|
||||
for i = 1, IceCore.BuffLimit do
|
||||
|
@ -1,3 +1,4 @@
|
||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
IceTargetAbsorb = IceCore_CreateClass(IceUnitBar)
|
||||
|
||||
IceTargetAbsorb.prototype.highestAbsorbSinceLastZero = 0
|
||||
@ -29,6 +30,28 @@ function IceTargetAbsorb.prototype:GetDefaultSettings()
|
||||
return settings
|
||||
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)
|
||||
IceTargetAbsorb.super.prototype.Enable(self, core)
|
||||
|
||||
@ -47,6 +70,7 @@ function IceTargetAbsorb.prototype:MyUnregisterCustomEvents()
|
||||
end
|
||||
|
||||
function IceTargetAbsorb.prototype:Update()
|
||||
IceTargetAbsorb.super.prototype.Update(self)
|
||||
self:UpdateAbsorbAmount()
|
||||
end
|
||||
|
||||
@ -63,13 +87,17 @@ function IceTargetAbsorb.prototype:UpdateAbsorbAmount(event, unit)
|
||||
self.highestAbsorbSinceLastZero = absorbAmount
|
||||
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)
|
||||
else
|
||||
self:Show(true)
|
||||
self:UpdateBar(absorbAmount / self.highestAbsorbSinceLastZero, self.ColorName)
|
||||
self:UpdateBar(self.absorbPercent, self.ColorName)
|
||||
end
|
||||
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||
|
@ -7,7 +7,7 @@ TargetCC.prototype.debuffRemaining = 0
|
||||
TargetCC.prototype.debuffDuration = 0
|
||||
|
||||
local GetNumPartyMembers, GetNumRaidMembers = GetNumPartyMembers, GetNumRaidMembers
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if GetNumGroupMembers then
|
||||
GetNumPartyMembers = GetNumGroupMembers
|
||||
GetNumRaidMembers = GetNumGroupMembers
|
||||
end
|
||||
@ -113,6 +113,8 @@ local IncapacitateCCList = {
|
||||
local FearCCList = {
|
||||
-- Psychic Scream
|
||||
8122,
|
||||
-- Fear (Retail)
|
||||
118699,
|
||||
-- Fear
|
||||
5782,
|
||||
-- Howl of Terror
|
||||
@ -336,7 +338,7 @@ end
|
||||
function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
|
||||
local i = 1
|
||||
local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
else
|
||||
debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
@ -360,7 +362,7 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
else
|
||||
debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
@ -373,11 +375,12 @@ end
|
||||
|
||||
function TargetCC.prototype:MyOnUpdate()
|
||||
TargetCC.super.prototype.MyOnUpdate(self)
|
||||
self:UpdateTargetDebuffs(nil, self.unit, true)
|
||||
self:UpdateTargetDebuffs("internal", self.unit)
|
||||
end
|
||||
|
||||
function TargetCC.prototype:UpdateTargetDebuffs(event, unit, isUpdate)
|
||||
function TargetCC.prototype:UpdateTargetDebuffs(event, unit)
|
||||
local name, duration, remaining
|
||||
local isUpdate = event == "internal"
|
||||
|
||||
if not isUpdate or not self.lastUpdateTime then
|
||||
self.debuffName, self.debuffDuration, self.debuffRemaining = self:GetMaxDebuffDuration(self.unit, self.debuffList)
|
||||
|
@ -15,7 +15,7 @@ end
|
||||
function TargetCast.prototype:Enable(core)
|
||||
TargetCast.super.prototype.Enable(self, core)
|
||||
|
||||
if IceHUD.WowVer >= 30200 then
|
||||
if IceHUD.EventExistsSpellcastInterruptible then
|
||||
self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "SpellCastInterruptible")
|
||||
self:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "SpellCastNotInterruptible")
|
||||
end
|
||||
@ -91,7 +91,7 @@ function TargetCast.prototype:TargetChanged(unit)
|
||||
|
||||
if UnitCastingInfo then
|
||||
local spell = UnitCastingInfo(self.unit)
|
||||
local notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 9 or 8, UnitCastingInfo(self.unit))
|
||||
local notInterruptible = select(IceHUD.SpellFunctionsReturnRank and 9 or 8, UnitCastingInfo(self.unit))
|
||||
if spell then
|
||||
self.notInterruptible = notInterruptibleCast
|
||||
self:StartBar(IceCastBar.Actions.Cast)
|
||||
@ -101,7 +101,7 @@ function TargetCast.prototype:TargetChanged(unit)
|
||||
|
||||
if UnitChannelInfo then
|
||||
local channel = UnitChannelInfo(self.unit)
|
||||
notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 8 or 7, UnitChannelInfo(self.unit))
|
||||
notInterruptible = select(IceHUD.SpellFunctionsReturnRank and 8 or 7, UnitChannelInfo(self.unit))
|
||||
if channel then
|
||||
self.notInterruptible = notInterruptibleChannel
|
||||
self:StartBar(IceCastBar.Actions.Channel)
|
||||
@ -183,11 +183,11 @@ function TargetCast.prototype:StartBar(action, message)
|
||||
local spell, notInterruptible
|
||||
if UnitCastingInfo then
|
||||
spell = UnitCastingInfo(self.unit)
|
||||
notInterruptible = select(IceHUD.WowVer < 80000 and 9 or 8, UnitCastingInfo(self.unit))
|
||||
notInterruptible = select(IceHUD.SpellFunctionsReturnRank and 9 or 8, UnitCastingInfo(self.unit))
|
||||
end
|
||||
if UnitChannelInfo and not spell then
|
||||
spell = UnitChannelInfo(self.unit)
|
||||
notInterruptible = select(IceHUD.WowVer < 80000 and 8 or 7, UnitChannelInfo(self.unit))
|
||||
notInterruptible = select(IceHUD.SpellFunctionsReturnRank and 8 or 7, UnitChannelInfo(self.unit))
|
||||
|
||||
if not spell then
|
||||
return
|
||||
|
@ -642,6 +642,10 @@ function IceTargetHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
|
||||
end
|
||||
|
||||
if IceHUD.ShouldUpdateTargetHealthEveryTick and self.unit == "target" then
|
||||
self.frame:SetScript("OnUpdate", function() self:Update(self.unit) end)
|
||||
end
|
||||
end
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
@ -659,6 +663,10 @@ function IceTargetHealth.prototype:Disable(core)
|
||||
|
||||
UnregisterUnitWatch(self.frame)
|
||||
|
||||
if self.registerEvents and IceHUD.ShouldUpdateTargetHealthEveryTick and self.unit == "target" then
|
||||
self.frame:SetScript("OnUpdate", nil)
|
||||
end
|
||||
|
||||
if self.moduleSettings.hideBlizz then
|
||||
self:ShowBlizz()
|
||||
end
|
||||
@ -833,6 +841,8 @@ function IceTargetHealth.prototype:Update(unit)
|
||||
|
||||
if (self.moduleSettings.scaleHealthColor) then
|
||||
self.color = "ScaledHealthColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||
self.color = "ScaledHealthColor"
|
||||
end
|
||||
|
||||
if (self.tapped) then
|
||||
@ -1057,20 +1067,25 @@ end
|
||||
|
||||
|
||||
function IceTargetHealth.prototype:ShowBlizz()
|
||||
TargetFrame:Show()
|
||||
TargetFrame:GetScript("OnLoad")(TargetFrame)
|
||||
|
||||
ComboFrame:Show()
|
||||
ComboFrame:GetScript("OnLoad")(ComboFrame)
|
||||
TargetFrame:SetParent(self.OriginalTargetFrameParent or UIParent)
|
||||
ComboFrame:SetParent(self.OriginalComboFrameParent or UIParent)
|
||||
end
|
||||
|
||||
|
||||
function IceTargetHealth.prototype:HideBlizz()
|
||||
TargetFrame:Hide()
|
||||
TargetFrame:UnregisterAllEvents()
|
||||
if not self.TargetFrameParent then
|
||||
self.TargetFrameParent = CreateFrame("Frame")
|
||||
self.TargetFrameParent:Hide()
|
||||
end
|
||||
if not self.ComboFrameParent then
|
||||
self.ComboFrameParent = CreateFrame("Frame")
|
||||
self.ComboFrameParent:Hide()
|
||||
end
|
||||
|
||||
ComboFrame:Hide()
|
||||
ComboFrame:UnregisterAllEvents()
|
||||
self.OriginalTargetFrameParent = TargetFrame:GetParent()
|
||||
TargetFrame:SetParent(self.TargetFrameParent)
|
||||
self.OriginalComboFrameParent = ComboFrame:GetParent()
|
||||
ComboFrame:SetParent(self.ComboFrameParent)
|
||||
end
|
||||
|
||||
function IceTargetHealth.prototype:UpdateBar(scale, color, alpha)
|
||||
@ -1095,7 +1110,7 @@ function IceTargetHealth.prototype:CheckPartyRole()
|
||||
proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||
|
||||
local p = self.unit
|
||||
if IceHUD.WowVer < 40000 then
|
||||
if not IceHUD.UnitGroupRolesReturnsRoleString then
|
||||
isTank, isHeal, isDPS = UnitGroupRolesAssigned(p)
|
||||
else
|
||||
local grpRole = UnitGroupRolesAssigned(p)
|
||||
|
@ -133,7 +133,7 @@ function IceTargetInfo.prototype:Enable(core)
|
||||
self:RegisterEvent("UNIT_LEVEL", "TargetLevel")
|
||||
|
||||
self:RegisterEvent("UNIT_FLAGS", "TargetFlags")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsUnitDynamicFlags then
|
||||
self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
|
||||
end
|
||||
|
||||
@ -1419,7 +1419,7 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
|
||||
local spellID
|
||||
---- end change by Fulzamoth
|
||||
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
|
||||
else
|
||||
---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
|
||||
|
@ -7,7 +7,7 @@ TargetInvuln.prototype.buffRemaining = 0
|
||||
TargetInvuln.prototype.buffDuration = 0
|
||||
|
||||
local GetNumPartyMembers, GetNumRaidMembers = GetNumPartyMembers, GetNumRaidMembers
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if GetNumGroupMembers then
|
||||
GetNumPartyMembers = GetNumGroupMembers
|
||||
GetNumRaidMembers = GetNumGroupMembers
|
||||
end
|
||||
@ -147,7 +147,7 @@ end
|
||||
function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
|
||||
local i = 1
|
||||
local buff, rank, texture, count, buffType, duration, endTime, unitCaster
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
else
|
||||
buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
@ -178,7 +178,7 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
else
|
||||
buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
@ -191,13 +191,14 @@ end
|
||||
|
||||
function TargetInvuln.prototype:MyOnUpdate()
|
||||
TargetInvuln.super.prototype.MyOnUpdate(self)
|
||||
self:UpdateTargetBuffs(nil, self.unit, true)
|
||||
self:UpdateTargetBuffs("internal", self.unit)
|
||||
end
|
||||
|
||||
function TargetInvuln.prototype:UpdateTargetBuffs(event, unit, isUpdate)
|
||||
function TargetInvuln.prototype:UpdateTargetBuffs(event, unit)
|
||||
local name, duration, remaining
|
||||
local isUpdate = event == "internal"
|
||||
|
||||
if not isUpdate then
|
||||
if not isUpdate or not self.lastUpdateTime then
|
||||
self.buffName, self.buffDuration, self.buffRemaining = self:GetMaxbuffDuration(self.unit, self.buffList)
|
||||
else
|
||||
self.buffRemaining = math.max(0, self.buffRemaining - (GetTime() - self.lastUpdateTime))
|
||||
|
@ -14,7 +14,7 @@ local SPELL_POWER_FURY = SPELL_POWER_FURY
|
||||
local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
|
||||
local SPELL_POWER_PAIN = SPELL_POWER_PAIN
|
||||
local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
if Enum and Enum.PowerType then
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
@ -66,9 +66,9 @@ function IceTargetMana.prototype:Enable(core)
|
||||
IceTargetMana.super.prototype.Enable(self, core)
|
||||
|
||||
if self.registerEvents then
|
||||
if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
|
||||
if not IceHUD.PerPowerEventsExist then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.EventExistsUnitMaxPower then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
@ -83,7 +83,7 @@ function IceTargetMana.prototype:Enable(core)
|
||||
self:RegisterEvent("UNIT_FOCUS", "UpdateEvent")
|
||||
|
||||
-- DK rune stuff
|
||||
if IceHUD.WowVer >= 30000 then
|
||||
if SPELL_POWER_RUNIC_POWER then
|
||||
self:RegisterEvent("UNIT_RUNIC_POWER", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXRUNIC_POWER", "UpdateEvent")
|
||||
end
|
||||
@ -125,6 +125,8 @@ function IceTargetMana.prototype:Update(unit)
|
||||
|
||||
if (self.moduleSettings.scaleManaColor) then
|
||||
self.color = "ScaledManaColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||
self.color = "ScaledManaColor"
|
||||
end
|
||||
|
||||
if (manaType == SPELL_POWER_RAGE) then
|
||||
@ -135,13 +137,13 @@ function IceTargetMana.prototype:Update(unit)
|
||||
self.color = "TargetEnergy"
|
||||
elseif (manaType == SPELL_POWER_RUNIC_POWER) then
|
||||
self.color = "TargetRunicPower"
|
||||
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_INSANITY) then
|
||||
elseif (manaType == SPELL_POWER_INSANITY) then
|
||||
self.color = "TargetInsanity"
|
||||
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_FURY) then
|
||||
elseif (manaType == SPELL_POWER_FURY) then
|
||||
self.color = "TargetFury"
|
||||
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_MAELSTROM) then
|
||||
elseif (manaType == SPELL_POWER_MAELSTROM) then
|
||||
self.color = "TargetMaelstrom"
|
||||
elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_PAIN) then
|
||||
elseif (manaType == SPELL_POWER_PAIN) then
|
||||
self.color = "TargetPain"
|
||||
end
|
||||
|
||||
|
@ -486,7 +486,7 @@ function TargetOfTarget.prototype:UpdateBuffs()
|
||||
if (self.moduleSettings.showDebuffs) then
|
||||
for i = 1, IceCore.BuffLimit do
|
||||
local buffName, buffRank, buffTexture, buffApplications
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
if IceHUD.SpellFunctionsReturnRank then
|
||||
buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
||||
else
|
||||
buffName, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
||||
|
@ -136,6 +136,8 @@ function TargetTargetHealth.prototype:Update(unit)
|
||||
|
||||
if (self.moduleSettings.scaleHealthColor) then
|
||||
self.color = "ScaledHealthColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
|
||||
self.color = "ScaledHealthColor"
|
||||
end
|
||||
|
||||
if (self.tapped) then
|
||||
|
@ -83,6 +83,8 @@ function TargetTargetMana.prototype:Update(unit)
|
||||
|
||||
if (self.moduleSettings.scaleManaColor) then
|
||||
self.color = "ScaledManaColor"
|
||||
elseif self.moduleSettings.lowThresholdColor and self.manaPercentage and self.manaPercentage <= self.moduleSettings.lowThreshold then
|
||||
self.color = "ScaledManaColor"
|
||||
end
|
||||
|
||||
if (manaType == 1) then
|
||||
|
@ -16,7 +16,7 @@ IceThreat.prototype.scheduledEvent = nil
|
||||
|
||||
local GetNumPartyMembers, GetNumRaidMembers = GetNumPartyMembers, GetNumRaidMembers
|
||||
local MAX_NUM_RAID_MEMBERS, MAX_NUM_PARTY_MEMBERS = MAX_NUM_RAID_MEMBERS, MAX_NUM_PARTY_MEMBERS
|
||||
if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
|
||||
if not GetNumPartyMembers then
|
||||
GetNumPartyMembers = GetNumGroupMembers
|
||||
GetNumRaidMembers = GetNumGroupMembers
|
||||
MAX_NUM_PARTY_MEMBERS = MAX_PARTY_MEMBERS
|
||||
|
@ -287,10 +287,9 @@ function Totems.prototype:CreateTotemFrame()
|
||||
self.frame.graphical = {}
|
||||
end
|
||||
|
||||
local totemType
|
||||
for i=1, self.numTotems do
|
||||
slot = TOTEM_PRIORITIES[i]
|
||||
self:CreateTotem(slot, self.totemNames[slot])
|
||||
local slot = TOTEM_PRIORITIES[i]
|
||||
self:CreateTotem(slot, self.totemNames[slot])
|
||||
end
|
||||
end
|
||||
|
||||
@ -340,16 +339,14 @@ function Totems.prototype:CreateTotem(i, name)
|
||||
return
|
||||
end
|
||||
local haveTotem, name, startTime, duration, icon = GetTotemInfo(i)
|
||||
local bWasNewFrame = false
|
||||
if (not self.frame.graphical[i]) then
|
||||
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
|
||||
self.frame.graphical[i].totem = self.frame.graphical[i]:CreateTexture(nil, "LOW")
|
||||
self.frame.graphical[i].totem = self.frame.graphical[i]:CreateTexture(nil, "BACKGROUND")
|
||||
self.frame.graphical[i].cd = CreateFrame("Cooldown", nil, self.frame.graphical[i], "CooldownFrameTemplate")
|
||||
self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
|
||||
|
||||
self.frame.graphical[i].totem:SetTexture(icon)
|
||||
self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
|
||||
bWasNewFrame = true
|
||||
end
|
||||
|
||||
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
|
||||
@ -376,9 +373,9 @@ function Totems.prototype:CreateTotem(i, name)
|
||||
self.graphicalOnLeave = function() GameTooltip:Hide() end
|
||||
end
|
||||
if not self.graphicalOnMouseUp then
|
||||
self.graphicalOnMouseUp = function (self, mouseButton)
|
||||
self.graphicalOnMouseUp = function (button, mouseButton)
|
||||
if mouseButton == "RightButton" then
|
||||
DestroyTotem(self.slot)
|
||||
DestroyTotem(button.slot)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -406,18 +403,19 @@ function Totems.prototype:CreateTotem(i, name)
|
||||
self.frame.graphical[i]:EnableMouse(true)
|
||||
self.frame.graphical[i]:SetScript("OnEnter", self.graphicalOnEnter)
|
||||
self.frame.graphical[i]:SetScript("OnLeave", self.graphicalOnLeave)
|
||||
if IceHUD.CanHookDestroyTotem then
|
||||
self.frame.graphical[i]:SetScript("OnMouseUp", self.graphicalOnMouseUp)
|
||||
end
|
||||
else
|
||||
self.frame.graphical[i]:EnableMouse(false)
|
||||
self.frame.graphical[i]:SetScript("OnEnter", nil)
|
||||
self.frame.graphical[i]:SetScript("OnLeave", nil)
|
||||
if IceHUD.CanHookDestroyTotem then
|
||||
self.frame.graphical[i]:SetScript("OnMouseUp", nil)
|
||||
end
|
||||
end
|
||||
self.frame.graphical[i].slot = i
|
||||
self.frame.graphical[i].name = name
|
||||
|
||||
-- it looks like HookScript will continue to add handlers every time instead of replacing them like SetScript
|
||||
if (bWasNewFrame) then
|
||||
--self.frame.graphical[i]:HookScript("OnMouseUp", self.graphicalOnMouseUp)
|
||||
end
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 118 KiB |
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 37 KiB |
@ -1,6 +1,69 @@
|
||||
# Changelog
|
||||
|
||||
v1.13.4:
|
||||
v1.14.14:
|
||||
|
||||
- Show Demon Hunter Fury top text as the raw Fury amount instead of a 0-100 scale with DogTags off. (ticket #301)
|
||||
- Package newer LibDogTag to fix upgrade bug in that library.
|
||||
- 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.
|
||||
|