mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 22:51:53 -05:00
Compare commits
148 Commits
Author | SHA1 | Date | |
---|---|---|---|
d43555b7c4
|
|||
90e0dd1597
|
|||
6282dfb256
|
|||
4de8cb0d27
|
|||
ea28a05051
|
|||
ca80ca3f75
|
|||
fe22f7e658
|
|||
354fb483bb
|
|||
f6c737c654
|
|||
9a38c4b3ea
|
|||
ab6b662ac4
|
|||
a2addcb627
|
|||
7f84c28538
|
|||
924bd4a6ef
|
|||
0f753448d7
|
|||
891ddc230c
|
|||
06353d4974
|
|||
d44e62bee4
|
|||
8fe1ef75b7
|
|||
702aa5bff6
|
|||
d6e1fd707a
|
|||
88d7dd3982
|
|||
f495bb15be
|
|||
087c64ee6a
|
|||
077f381adb
|
|||
a5be2996da
|
|||
22f473b54d
|
|||
e7f95cbcb6
|
|||
5c19d7f89c
|
|||
f01d6495f8
|
|||
34ecd95e4f
|
|||
564919e0c6
|
|||
a18144aec0
|
|||
53bf76c58a
|
|||
1140d2e8c5
|
|||
7d562dfb35
|
|||
7c2fe06fa8
|
|||
819cc64aca
|
|||
36c8f02fc2
|
|||
db7d797eb2
|
|||
a9cf5d5b2c
|
|||
81d8ffeae1
|
|||
d9c3de0a5e
|
|||
efdad59911
|
|||
b8e8b41ae7
|
|||
261be76d90 | |||
55fbfbdf1c
|
|||
e6077ab39f
|
|||
abf3c0d514
|
|||
b1e746bec9
|
|||
659de89d0c
|
|||
da79bb35c8
|
|||
b40829abbb | |||
7dfc05aa91
|
|||
a0d05ebf94
|
|||
b5b5c31791
|
|||
5c66970d8f
|
|||
4fbb70ebc0
|
|||
9cfa00227f
|
|||
9b90694912 | |||
67f79736d8
|
|||
dc98e5b521
|
|||
94506cc591
|
|||
09d9a9c6f7 | |||
8b7ce521ff | |||
26fd86134b | |||
e4d8bae185
|
|||
2d42116f8d
|
|||
a7d1629ed3
|
|||
070d66eca3
|
|||
a0c5b97ccb
|
|||
3e56595709
|
|||
c016b0ccc0
|
|||
d0187a44e3
|
|||
b4e1374400
|
|||
ba8748ecca
|
|||
5b71a4f819
|
|||
77351997b4
|
|||
901b49f7b3
|
|||
53b59b5be2
|
|||
1bb217c4aa
|
|||
8469824f53
|
|||
118aa0f493
|
|||
48ee6c0270
|
|||
395de299f0
|
|||
588ba76ef5
|
|||
9fc64bcfe4
|
|||
a4945641fb
|
|||
195b7ab264
|
|||
410cc2b634
|
|||
6986131d73
|
|||
43aff89b5c
|
|||
b3a1602d6c
|
|||
c558010b25
|
|||
af42f4a4f3
|
|||
ccdabc210c
|
|||
32e2ce3902
|
|||
9764694568
|
|||
337bd72545
|
|||
c4d35b9766
|
|||
7dfe505db2
|
|||
a8f175fad4
|
|||
1591b36e89
|
|||
8ddc6c5911
|
|||
bbab772044
|
|||
d27fb83f02
|
|||
59e8ac2de8
|
|||
ef9fcdf29b
|
|||
ac8effb177
|
|||
b89bc5516e
|
|||
5ae7771fea
|
|||
0d146ab10f
|
|||
02ad6253d3 | |||
6445b424b3 | |||
383b7cae2f | |||
62201381c5 | |||
161b0215be | |||
11ef3354f0 | |||
be64b56da6 | |||
4a6868a906 | |||
47362d4cb0 | |||
26502214b2 | |||
ee3d107863 | |||
beb080b104 | |||
2d48f3a24c | |||
5605fcbc2b | |||
7ebe7a05d7 | |||
bb4d7640ed | |||
388e314371 | |||
89ef91b9b3 | |||
0f7a2ff4f1 | |||
3ea273fe47 | |||
5003608a34 | |||
c21fe96707 | |||
d108ac9e2e | |||
6c4e815b9e | |||
46daddbed9 | |||
1b64adc77c | |||
35e56ebec6 | |||
5fe8776249 | |||
08e8d3a087 | |||
2eae8fa419 | |||
94850e53dd | |||
a739b7ba99 | |||
176603ec51 | |||
0cdfde1758 | |||
2f7b081790 | |||
b7883036fd |
50
.github/workflows/release.yml
vendored
Normal file
50
.github/workflows/release.yml
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
# description of this workflow, can be anything you want
|
||||
name: Package and release
|
||||
|
||||
# we need to let GitHub know _when_ we want to release, typically only when we create a new tag.
|
||||
# this will target only tags, and not all pushes to the master branch.
|
||||
# this part can be heavily customized to your liking, like targeting only tags that match a certain word,
|
||||
# other branches or even pullrequests.
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '**'
|
||||
|
||||
# a workflow is built up as jobs, and within these jobs are steps
|
||||
jobs:
|
||||
|
||||
# "release" is a job, you can name it anything you want
|
||||
release:
|
||||
|
||||
# we can run our steps on pretty much anything, but the "ubuntu-latest" image is a safe bet
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
# specify the environment variables used by the packager, matching the secrets from the project on GitHub
|
||||
env:
|
||||
CF_API_KEY: ${{ secrets.CF_API_KEY }}
|
||||
WOWI_API_TOKEN: ${{ secrets.WOWI_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_"
|
||||
|
||||
# "steps" holds a list of all the steps needed to package and release our AddOn
|
||||
steps:
|
||||
|
||||
# we first have to clone the AddOn project, this is a required step
|
||||
- name: Clone project
|
||||
uses: actions/checkout@v1
|
||||
|
||||
# once cloned, we just run the GitHub Action for the packager project
|
||||
- name: Package and release
|
||||
uses: BigWigsMods/packager@master
|
||||
|
||||
# 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
|
||||
with:
|
||||
args: -g classic -w 0
|
||||
|
||||
- name: Package and release for TBC
|
||||
uses: BigWigsMods/packager@master
|
||||
with:
|
||||
args: -g bc -w 0
|
1
.mailmap
1
.mailmap
@ -1,2 +1,3 @@
|
||||
Parnic <parnic@parnic.com> Parnic <chris@parnic.com>
|
||||
rokiyo <rokiyo@example.com> Rokiyo <Rokiyo@example.com>
|
||||
Parnic <parnic@parnic.com> Chris Pickett <chris@perniciousgames.com>
|
||||
|
6
.pkgmeta
6
.pkgmeta
@ -24,7 +24,7 @@ externals:
|
||||
tag: latest
|
||||
libs/AceGUI-3.0:
|
||||
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
|
||||
tag: latest
|
||||
tag: latest
|
||||
libs/AceGUI-3.0-SharedMediaWidgets:
|
||||
url: svn://svn.wowace.com/wow/ace-gui-3-0-shared-media-widgets/mainline/trunk/AceGUI-3.0-SharedMediaWidgets
|
||||
tag: latest
|
||||
@ -65,4 +65,6 @@ tools-used:
|
||||
ignore:
|
||||
- readme.md
|
||||
|
||||
manual-changelog: changelog.txt
|
||||
manual-changelog: this_version.md
|
||||
|
||||
enable-nolib-creation: yes
|
||||
|
@ -171,6 +171,7 @@ function IceBarElement.prototype:GetDefaultSettings()
|
||||
settings["rotateBar"] = false
|
||||
settings["markers"] = {}
|
||||
settings["bAllowExpand"] = true
|
||||
settings["textVerticalGap"] = 0
|
||||
|
||||
return settings
|
||||
end
|
||||
@ -414,7 +415,7 @@ do
|
||||
type='range',
|
||||
name = L["Bar vertical offset"],
|
||||
desc = L["Adjust the vertical placement of this bar"],
|
||||
min = -400,
|
||||
min = -600,
|
||||
max = 600,
|
||||
step = 1,
|
||||
get = function()
|
||||
@ -435,7 +436,7 @@ do
|
||||
type='range',
|
||||
name = L["Bar horizontal adjust"],
|
||||
desc = L["This is a per-pixel horizontal adjustment. You should probably use the 'offset' setting above as it is designed to snap bars together. This may be used in the case of a horizontal bar needing to be positioned outside the normal bar locations."],
|
||||
min = -400,
|
||||
min = -600,
|
||||
max = 600,
|
||||
step = 1,
|
||||
get = function()
|
||||
@ -724,6 +725,26 @@ do
|
||||
order = 11.3,
|
||||
},
|
||||
|
||||
textVerticalGap = {
|
||||
type = 'range',
|
||||
name = L["Text Vertical Gap"],
|
||||
desc = L["Gap between Upper and Lower text vertically"],
|
||||
min = 0,
|
||||
max = 10,
|
||||
step = 1,
|
||||
get = function()
|
||||
return self.moduleSettings.textVerticalGap
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.textVerticalGap = v
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 11.4,
|
||||
},
|
||||
|
||||
textHeader = {
|
||||
type = 'header',
|
||||
name = L["Upper Text"],
|
||||
@ -1019,7 +1040,7 @@ end
|
||||
|
||||
-- Creates the actual bar
|
||||
function IceBarElement.prototype:CreateBar()
|
||||
self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK")
|
||||
self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
|
||||
self:SetBarCoord(self.barFrame)
|
||||
|
||||
self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
|
||||
@ -1029,9 +1050,9 @@ end
|
||||
|
||||
-- Returns a barFrame & barFrame.bar
|
||||
-- Rokiyo: Currently keeping old behaviour of running through bar creation on every Redraw, but I'm not convinced we need to.
|
||||
function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer)
|
||||
function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer, nameSuffix)
|
||||
if not (barFrame) then
|
||||
barFrame = CreateFrame("Frame", nil, self.frame)
|
||||
barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
|
||||
end
|
||||
|
||||
barFrame:SetFrameStrata(frameStrata and frameStrata or "LOW")
|
||||
@ -1116,8 +1137,13 @@ function IceBarElement.prototype:CreateTexts()
|
||||
offy = self.moduleSettings.textVerticalOffset
|
||||
end
|
||||
|
||||
local offgap = 0
|
||||
if self.moduleSettings.textVerticalGap ~= nil then
|
||||
offgap = self.moduleSettings.textVerticalGap
|
||||
end
|
||||
|
||||
self.frame.bottomUpperText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy)
|
||||
self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - 14)
|
||||
self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - (14 + offgap))
|
||||
|
||||
if (self.moduleSettings.textVisible["upper"]) then
|
||||
self.frame.bottomUpperText:Show()
|
||||
@ -1433,6 +1459,16 @@ function IceBarElement.prototype:SetScaledColor(colorVar, percent, maxColor, min
|
||||
colorVar.b = ((maxColor.b - minColor.b) * percent) + minColor.b
|
||||
end
|
||||
|
||||
function IceBarElement.prototype:Round(num)
|
||||
if (num > 1000000) then
|
||||
return IceHUD:MathRound(num/1000000, 1) .. "M"
|
||||
end
|
||||
if (num > 1000) then
|
||||
return IceHUD:MathRound(num/1000, 1) .. "k"
|
||||
end
|
||||
return num
|
||||
end
|
||||
|
||||
-- To be overridden
|
||||
function IceBarElement.prototype:Update()
|
||||
end
|
||||
@ -1548,7 +1584,7 @@ function IceBarElement.prototype:CreateMarker(idx)
|
||||
self.Markers[idx] = nil
|
||||
end
|
||||
|
||||
self.Markers[idx] = self:BarFactory(self.Markers[idx], "MEDIUM", "OVERLAY")
|
||||
self.Markers[idx] = self:BarFactory(self.Markers[idx], "MEDIUM", "OVERLAY", "Marker"..idx)
|
||||
|
||||
local color = self.moduleSettings.markers[idx].color
|
||||
self.Markers[idx].bar:SetVertexColor(color.r, color.g, color.b, self.alpha)
|
||||
|
161
IceCastBar.lua
161
IceCastBar.lua
@ -12,6 +12,32 @@ IceCastBar.prototype.actionMessage = nil
|
||||
IceCastBar.prototype.unit = nil
|
||||
IceCastBar.prototype.current = nil
|
||||
|
||||
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
end
|
||||
|
||||
local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo
|
||||
if IceHUD.WowClassic then
|
||||
UnitCastingInfo = CastingInfo
|
||||
UnitChannelInfo = ChannelInfo
|
||||
end
|
||||
|
||||
-- Fulzamoth 2019-09-27 : Use LibClassicCasterino if it's there so we can use TargetCast
|
||||
-- module in Classic WoW
|
||||
if IceHUD.WowClassic then
|
||||
LibClassicCasterino = LibStub("LibClassicCasterino", true)
|
||||
if LibClassicCasterino then
|
||||
UnitCastingInfo = function(unit)
|
||||
return LibClassicCasterino:UnitCastingInfo(unit)
|
||||
end
|
||||
UnitChannelInfo = function(unit)
|
||||
return LibClassicCasterino:UnitChannelInfo(unit)
|
||||
end
|
||||
end
|
||||
end
|
||||
-- end Fulzamoth change
|
||||
|
||||
local AuraIconWidth = 20
|
||||
local AuraIconHeight = 20
|
||||
|
||||
@ -35,21 +61,55 @@ end
|
||||
function IceCastBar.prototype:Enable(core)
|
||||
IceCastBar.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_SPELLCAST_SENT", "SpellCastSent") -- "player", spell, rank, target
|
||||
self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
|
||||
self:RegisterEvent("UNIT_SPELLCAST_START", "SpellCastStart") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_STOP", "SpellCastStop") -- unit, spell, rank
|
||||
-- Fulzamoth 2019-09-27 : LibClassicCasterino support
|
||||
-- Setup callback to the library, and route events to
|
||||
-- IceHUD's handler functions.
|
||||
if LibClassicCasterino then
|
||||
local CastbarEventHandler = function(event, ...) -- unitTarget, castGUID, spellID
|
||||
if (event == "UNIT_SPELLCAST_START") then
|
||||
return IceCastBar.prototype.SpellCastStart(self, event, ...)
|
||||
elseif (event == "UNIT_SPELLCAST_DELAYED") then
|
||||
return IceCastBar.prototype.SpellCastDelayed(self, event, ...)
|
||||
elseif (event == "UNIT_SPELLCAST_STOP") then
|
||||
return IceCastBar.prototype.SpellCastStop(self, event, ...)
|
||||
elseif (event == "UNIT_SPELLCAST_FAILED") then
|
||||
return IceCastBar.prototype.SpellCastFailed(self, event, ...)
|
||||
elseif (event == "UNIT_SPELLCAST_INTERRUPTED") then
|
||||
return IceCastBar.prototype.SpellCastInterrupted(self, event, ...)
|
||||
elseif (event == "UNIT_SPELLCAST_CHANNEL_START") then
|
||||
return IceCastBar.prototype.SpellCastChannelStart(self, event, ...)
|
||||
elseif (event == "UNIT_SPELLCAST_CHANNEL_UPDATE") then
|
||||
return IceCastBar.prototype.SpellCastChannelUpdate(self, event, ...)
|
||||
elseif (event == "UNIT_SPELLCAST_CHANNEL_STOP") then
|
||||
return IceCastBar.prototype.SpellCastChannelStop(self, event, ...)
|
||||
end
|
||||
end
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_START", CastbarEventHandler)
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_DELAYED", CastbarEventHandler) -- only for player
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_STOP", CastbarEventHandler)
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_FAILED", CastbarEventHandler)
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_INTERRUPTED", CastbarEventHandler)
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_START", CastbarEventHandler)
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_UPDATE", CastbarEventHandler) -- only for player
|
||||
LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_STOP", CastbarEventHandler)
|
||||
else -- No LibClassicCasterino, or we're not on Classic, so use IceHUD's normal event handlers.
|
||||
|
||||
self:RegisterEvent("UNIT_SPELLCAST_FAILED", "SpellCastFailed") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED", "SpellCastInterrupted") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_SENT", "SpellCastSent") -- "player", spell, rank, target
|
||||
self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
|
||||
self:RegisterEvent("UNIT_SPELLCAST_START", "SpellCastStart") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_STOP", "SpellCastStop") -- unit, spell, rank
|
||||
|
||||
self:RegisterEvent("UNIT_SPELLCAST_DELAYED", "SpellCastDelayed") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "SpellCastSucceeded") -- "player", spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_FAILED", "SpellCastFailed") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED", "SpellCastInterrupted") -- unit, spell, rank
|
||||
|
||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START", "SpellCastChannelStart") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_DELAYED", "SpellCastDelayed") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "SpellCastSucceeded") -- "player", spell, rank
|
||||
|
||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START", "SpellCastChannelStart") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
|
||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
|
||||
|
||||
end
|
||||
self:Show(false)
|
||||
end
|
||||
|
||||
@ -86,7 +146,7 @@ function IceCastBar.prototype:GetOptions()
|
||||
end,
|
||||
order = 39.998
|
||||
}
|
||||
|
||||
if IceHUD.WowVer < 80000 then
|
||||
opts["showSpellRank"] =
|
||||
{
|
||||
type = 'toggle',
|
||||
@ -103,7 +163,7 @@ function IceCastBar.prototype:GetOptions()
|
||||
end,
|
||||
order = 39.999
|
||||
}
|
||||
|
||||
end
|
||||
opts["iconSettings"] = {
|
||||
type = 'group',
|
||||
name = "|c"..self.configColor..L["Icon Settings"].."|r",
|
||||
@ -346,13 +406,25 @@ end
|
||||
|
||||
|
||||
function IceCastBar.prototype:StartBar(action, message)
|
||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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
|
||||
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
||||
else
|
||||
spell, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
|
||||
end
|
||||
end
|
||||
|
||||
if not spell then
|
||||
return
|
||||
-- Fulzamoth 2019-09-27 : LibClassicCasterino won't return spell info on target's failed or interrupted cast
|
||||
if LibClassicCasterino and not spell then
|
||||
self:StopBar()
|
||||
elseif not spell then
|
||||
return
|
||||
end
|
||||
|
||||
if icon ~= nil then
|
||||
@ -378,7 +450,7 @@ function IceCastBar.prototype:StartBar(action, message)
|
||||
self.actionDuration = 1 -- instants/failures
|
||||
end
|
||||
|
||||
if not (message) then
|
||||
if not (message) and spell then
|
||||
self.actionMessage = spell .. (self.moduleSettings.showSpellRank and self:GetShortRank(rank) or "")
|
||||
end
|
||||
|
||||
@ -398,7 +470,7 @@ function IceCastBar.prototype:StopBar()
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:GetShortRank(rank)
|
||||
if (rank) then
|
||||
if IceHUD.WowVer < 80000 and rank then
|
||||
local _, _, sRank = string.find(rank, "(%d+)")
|
||||
if (sRank) then
|
||||
return " (" .. sRank .. ")"
|
||||
@ -413,30 +485,30 @@ end
|
||||
-- NORMAL SPELLS --
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
function IceCastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
|
||||
function IceCastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
IceHUD:Debug("SpellCastSent", unit, spell, rank, target, lineId)
|
||||
IceHUD:Debug("SpellCastSent", unit, target, castGuid, spellId)
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:SpellCastChanged(event, arg1)
|
||||
IceHUD:Debug("SpellCastChanged", arg1)
|
||||
function IceCastBar.prototype:SpellCastChanged(event, cancelled)
|
||||
IceHUD:Debug("SpellCastChanged", cancelled)
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
|
||||
function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
IceHUD:Debug("SpellCastStart", unit, spell, rank, lineId, spellId)
|
||||
IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
|
||||
--UnitCastingInfo(unit)
|
||||
|
||||
self:StartBar(IceCastBar.Actions.Cast)
|
||||
self.current = lineId
|
||||
self.current = castGuid
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, spellId)
|
||||
function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
IceHUD:Debug("SpellCastStop", unit, spell, self.current, rank, lineId, spellId)
|
||||
IceHUD:Debug("SpellCastStop", unit, castGuid, spellId)
|
||||
|
||||
-- ignore if not coming from current spell
|
||||
if (self.current and lineId and self.current ~= lineId) then
|
||||
if (self.current and castGuid and self.current ~= castGuid) then
|
||||
return
|
||||
end
|
||||
|
||||
@ -450,12 +522,12 @@ function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, sp
|
||||
end
|
||||
|
||||
|
||||
function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId, spellId)
|
||||
function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
IceHUD:Debug("SpellCastFailed", unit, self.current, lineId, spellId)
|
||||
IceHUD:Debug("SpellCastFailed", unit, castGuid, spellId)
|
||||
|
||||
-- ignore if not coming from current spell
|
||||
if (self.current and lineId and self.current ~= lineId) then
|
||||
if (self.current and castGuid and self.current ~= castGuid) then
|
||||
return
|
||||
end
|
||||
|
||||
@ -478,12 +550,12 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId,
|
||||
self:StartBar(IceCastBar.Actions.Failure, "Failed")
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lineId, spellId)
|
||||
function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
IceHUD:Debug("SpellCastInterrupted", unit, self.current, lineId, spellId)
|
||||
IceHUD:Debug("SpellCastInterrupted", unit, castGuid, spellId)
|
||||
|
||||
-- ignore if not coming from current spell
|
||||
if (self.current and lineId and self.current ~= lineId) then
|
||||
if (self.current and castGuid and self.current ~= castGuid) then
|
||||
return
|
||||
end
|
||||
|
||||
@ -492,11 +564,11 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lin
|
||||
self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
|
||||
end
|
||||
|
||||
function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
|
||||
function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
--IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit))
|
||||
|
||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
|
||||
local endTime = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) 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
|
||||
@ -505,9 +577,9 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
|
||||
end
|
||||
|
||||
|
||||
function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineId, spellId)
|
||||
function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
--IceHUD:Debug("SpellCastSucceeded", unit, spell, rank)
|
||||
--IceHUD:Debug("SpellCastSucceeded", unit, castGuid, spellId)
|
||||
|
||||
-- never show on channeled (why on earth does this event even fire when channeling starts?)
|
||||
if (self.action == IceCastBar.Actions.Channel) then
|
||||
@ -515,10 +587,12 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineI
|
||||
end
|
||||
|
||||
-- ignore if not coming from current spell
|
||||
if (self.current and self.current ~= lineId) then
|
||||
if (self.current and self.current ~= castGuid) then
|
||||
return
|
||||
end
|
||||
|
||||
local spell = GetSpellInfo(spellId)
|
||||
|
||||
-- show after normal successfull cast
|
||||
if (self.action == IceCastBar.Actions.Cast) then
|
||||
self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
|
||||
@ -554,7 +628,12 @@ function IceCastBar.prototype:SpellCastChannelUpdate(event, unit)
|
||||
if (unit ~= self.unit or not self.actionStartTime) then return end
|
||||
--IceHUD:Debug("SpellCastChannelUpdate", unit, UnitChannelInfo(unit))
|
||||
|
||||
local spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
||||
local spell, rank, displayName, icon, startTime, endTime
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
||||
else
|
||||
spell, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
|
||||
end
|
||||
if not spell then
|
||||
self.actionDuration = 0
|
||||
else
|
||||
|
42
IceCore.lua
42
IceCore.lua
@ -94,6 +94,7 @@ function IceCore.prototype:SetupDefaults()
|
||||
|
||||
bHideDuringPetBattles = true,
|
||||
bHideInBarberShop = true,
|
||||
bHideDuringShellGame = true,
|
||||
},
|
||||
global = {
|
||||
lastRunVersion = 0,
|
||||
@ -173,6 +174,13 @@ function IceCore.prototype:CheckDisplayUpdateMessage()
|
||||
self.settings.modules["DruidMana"] = nil
|
||||
end
|
||||
end
|
||||
if self.accountSettings.lastRunVersion <= 20180720033008 then
|
||||
if self.settings.modules["HarmonyPower"] ~= nil then
|
||||
self.settings.modules["Chi"] = self.settings.modules["HarmonyPower"]
|
||||
self.settings.modules["HarmonyPower"] = nil
|
||||
self.settings.colors["ChiNumeric"] = self.settings.colors["HarmonyPowerNumeric"]
|
||||
end
|
||||
end
|
||||
self.accountSettings.lastRunVersion = thisVersion
|
||||
end
|
||||
end
|
||||
@ -243,10 +251,15 @@ function IceCore.prototype:Enable(userToggle)
|
||||
IceHUD_Options:GenerateModuleOptions()
|
||||
end
|
||||
|
||||
self.IceHUDFrame:RegisterEvent("PET_BATTLE_OPENING_START")
|
||||
self.IceHUDFrame:RegisterEvent("PET_BATTLE_OVER")
|
||||
self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
|
||||
self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
|
||||
if UnitCanPetBattle then
|
||||
self.IceHUDFrame:RegisterEvent("PET_BATTLE_OPENING_START")
|
||||
self.IceHUDFrame:RegisterEvent("PET_BATTLE_OVER")
|
||||
end
|
||||
if GetBarberShopStyleInfo then
|
||||
self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
|
||||
self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
|
||||
end
|
||||
self.IceHUDFrame:RegisterEvent("UNIT_AURA")
|
||||
self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
|
||||
if (event == "PET_BATTLE_OPENING_START") then
|
||||
if IceHUD.IceCore.settings.bHideDuringPetBattles then
|
||||
@ -264,6 +277,15 @@ function IceCore.prototype:Enable(userToggle)
|
||||
if IceHUD.IceCore.settings.bHideInBarberShop then
|
||||
self:Show()
|
||||
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
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE")
|
||||
self:Hide()
|
||||
end
|
||||
elseif (event == "UNIT_EXITED_VEHICLE") then
|
||||
self:UnregisterEvent("UNIT_EXITED_VEHICLE")
|
||||
self:Show()
|
||||
end
|
||||
end)
|
||||
|
||||
@ -498,10 +520,14 @@ function IceCore.prototype:Disable(userToggle)
|
||||
end
|
||||
end
|
||||
|
||||
self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OPENING_START")
|
||||
self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OVER")
|
||||
self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_OPEN")
|
||||
self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_CLOSE")
|
||||
if UnitCanPetBattle then
|
||||
self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OPENING_START")
|
||||
self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OVER")
|
||||
end
|
||||
if GetBarberShopStyleInfo then
|
||||
self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_OPEN")
|
||||
self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_CLOSE")
|
||||
end
|
||||
self.IceHUDFrame:SetScript("OnEvent", nil)
|
||||
|
||||
self.enabled = false
|
||||
|
@ -69,7 +69,7 @@ function IceElement.prototype:Create(parent)
|
||||
|
||||
self.parent = parent
|
||||
if not self.masterFrame then
|
||||
self.masterFrame = CreateFrame("Frame", nil, self.parent)
|
||||
self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
|
||||
self.masterFrame:SetFrameStrata("MEDIUM")
|
||||
end
|
||||
self:CreateFrame()
|
||||
|
63
IceHUD.lua
63
IceHUD.lua
@ -6,7 +6,7 @@ local IceHUD = IceHUD
|
||||
local SML = LibStub("LibSharedMedia-3.0")
|
||||
local ACR = LibStub("AceConfigRegistry-3.0")
|
||||
local ConfigDialog = LibStub("AceConfigDialog-3.0")
|
||||
local icon = LibStub("LibDBIcon-1.0")
|
||||
local icon = LibStub("LibDBIcon-1.0", true)
|
||||
local AceGUI = LibStub("AceGUI-3.0")
|
||||
local AceSerializer = LibStub("AceSerializer-3.0", 1)
|
||||
|
||||
@ -17,6 +17,10 @@ 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.UnitPowerEvent = "UNIT_POWER_UPDATE"
|
||||
|
||||
IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc",
|
||||
"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
|
||||
@ -256,6 +260,10 @@ function IceHUD:NotifyOptionsChange()
|
||||
end
|
||||
|
||||
function IceHUD:OnEnable(isFirst)
|
||||
-- if isFirst then
|
||||
self:SetDebugging(self.IceCore:GetDebug())
|
||||
self.debugFrame = ChatFrame1
|
||||
-- end
|
||||
self:Debug("IceHUD:OnEnable()")
|
||||
|
||||
if self.db.profile.enable then
|
||||
@ -271,11 +279,6 @@ function IceHUD:OnEnable(isFirst)
|
||||
--@debug@
|
||||
IceHUD_Options:OnLoad()
|
||||
--@end-debug@
|
||||
|
||||
-- if isFirst then
|
||||
self:SetDebugging(self.IceCore:GetDebug())
|
||||
self.debugFrame = ChatFrame1
|
||||
-- end
|
||||
end
|
||||
|
||||
-- add settings changes/updates here so that existing users don't lose their settings
|
||||
@ -322,7 +325,7 @@ end
|
||||
-- blizzard interface options
|
||||
local blizOptionsPanel = CreateFrame("FRAME", "IceHUDConfigPanel", UIParent)
|
||||
blizOptionsPanel.name = "IceHUD"
|
||||
blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, IceHUD.WowVer >= 50000 and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
|
||||
blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, (IceHUD.WowVer >= 50000 or IceHUD.WowClassic) and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
|
||||
blizOptionsPanel.button:SetText("Open IceHUD configuration")
|
||||
blizOptionsPanel.button:SetWidth(240)
|
||||
blizOptionsPanel.button:SetHeight(30)
|
||||
@ -364,7 +367,11 @@ function IceHUD:Debug(...)
|
||||
for n=1,select('#', ...) do
|
||||
msg = msg .. tostring(select(n, ...)) .. " "
|
||||
end
|
||||
self.debugFrame:AddMessage(msg)
|
||||
if self.debugFrame then
|
||||
self.debugFrame:AddMessage(msg)
|
||||
else
|
||||
print(msg)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -409,7 +416,12 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
|
||||
end
|
||||
|
||||
local i = 1
|
||||
local name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
local name, _, texture, applications
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
else
|
||||
name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
end
|
||||
while name do
|
||||
if (not matchByName and string.match(texture:upper(), ability:upper()))
|
||||
or (matchByName and string.match(name:upper(), ability:upper())) then
|
||||
@ -417,7 +429,11 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
|
||||
end
|
||||
|
||||
i = i + 1
|
||||
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
else
|
||||
name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
|
||||
end
|
||||
end
|
||||
|
||||
return 0
|
||||
@ -426,13 +442,18 @@ end
|
||||
do
|
||||
local retval = {}
|
||||
|
||||
function IceHUD:HasBuffs(unit, spellIDs)
|
||||
function IceHUD:HasBuffs(unit, spellIDs, filter)
|
||||
for i=1, #spellIDs do
|
||||
retval[i] = false
|
||||
end
|
||||
|
||||
local i = 1
|
||||
local name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
||||
local name, _, texture, applications, _, _, _, _, _, _, auraID
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
else
|
||||
name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
end
|
||||
while name do
|
||||
for i=1, #spellIDs do
|
||||
if spellIDs[i] == auraID then
|
||||
@ -442,11 +463,19 @@ do
|
||||
end
|
||||
|
||||
i = i + 1
|
||||
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
else
|
||||
name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
|
||||
end
|
||||
end
|
||||
|
||||
return retval
|
||||
end
|
||||
|
||||
function IceHUD:HasDebuffs(unit, spellIDs, filter)
|
||||
return IceHUD:HasBuffs(unit, spellIDs, filter and filter.."|HARMFUL" or "HARMFUL")
|
||||
end
|
||||
end
|
||||
|
||||
function IceHUD:OnDisable()
|
||||
@ -581,6 +610,10 @@ local function CheckLFGMode(mode)
|
||||
end
|
||||
|
||||
function IceHUD:GetIsInLFGGroup()
|
||||
if not GetLFGMode then
|
||||
return false
|
||||
end
|
||||
|
||||
local mode, submode
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
mode, submode = GetLFGMode(LE_LFG_CATEGORY_LFD)
|
||||
@ -724,7 +757,9 @@ local function figure_unit_menu(unit)
|
||||
end
|
||||
|
||||
IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
|
||||
UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
|
||||
if UnitPopupFrames then
|
||||
UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
|
||||
end
|
||||
|
||||
IceHUD.DropdownUnit = nil
|
||||
UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()
|
||||
|
15
IceHUD.toc
15
IceHUD.toc
@ -1,14 +1,22 @@
|
||||
## Interface: 70100
|
||||
## Interface: 90005
|
||||
## Interface-Retail: 90005
|
||||
## Interface-Classic: 11306
|
||||
## Interface-BC: 20501
|
||||
## Author: Parnic, originally created by Iceroth
|
||||
## Name: IceHUD
|
||||
## Title: IceHUD |cff7fff7f-Ace3-|r
|
||||
## Notes: Another HUD addon
|
||||
## Version: @project-version@
|
||||
#@debug@
|
||||
## Version: development
|
||||
#@end-debug@
|
||||
#@non-debug@
|
||||
# ## Version: @project-version@
|
||||
#@end-non-debug@
|
||||
## SavedVariables: IceCoreDB
|
||||
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
|
||||
## X-Compatible-With: 70000
|
||||
## X-Category: HUDs
|
||||
## X-Website: https://www.wowace.com/projects/ice-hud
|
||||
## X-Curse-Project-ID: 5394
|
||||
## X-WoWI-ID: 8149
|
||||
|
||||
#@no-lib-strip@
|
||||
@ -29,7 +37,6 @@ IceCastBar.lua
|
||||
IceStackCounter.lua
|
||||
|
||||
# IceHUD modules
|
||||
# - Feel free to comment these out if you like
|
||||
modules\PlayerHealth.lua
|
||||
modules\PlayerMana.lua
|
||||
modules\TargetHealth.lua
|
||||
|
@ -1,4 +1,7 @@
|
||||
## Interface: 70100
|
||||
## Interface: 90005
|
||||
## Interface-Retail: 90005
|
||||
## Interface-Classic: 11306
|
||||
## Interface-BC: 20501
|
||||
## Title: IceHUD |cff7fff7f-Options-|r
|
||||
## Author: Parnic
|
||||
## Version: @project-version@
|
||||
|
@ -1,6 +1,6 @@
|
||||
local LibDualSpec = LibStub('LibDualSpec-1.0', true)
|
||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local icon = LibStub("LibDBIcon-1.0")
|
||||
local icon = LibStub("LibDBIcon-1.0", true)
|
||||
local lastCustomModule = "Bar"
|
||||
|
||||
IceHUD_Options = {}
|
||||
@ -71,7 +71,7 @@ This isn't |cff9999ffIceHUD|r - it's Blizzard's Spell Alerts they added in 4.0.1
|
||||
Expand "|cffffdc42Module Settings|r", expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
|
||||
|
||||
|cff9999ff14. Which module displays Monk Chi power?|r
|
||||
This module is called |cffdcff42HarmonyPower|r. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. I feel like it's too late to change now that many people are familiar with the Harmony name.
|
||||
Prior to |cff9999ffIceHUD|r v1.11.2, this module was called |cffdcff42HarmonyPower|r. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. |cff9999ffIceHUD|r v1.11.2 changed this module to be called |cffdcff42Chi|r.
|
||||
|
||||
|cff9999ff15. How do I add commas/periods into big numbers like health?|r
|
||||
If you have |cff42ffffDogTags|r enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
|
||||
@ -83,7 +83,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 -> Interface -> Names -> Personal Resource Display.
|
||||
|
||||
|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.
|
||||
|
||||
|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.]]
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -379,6 +385,7 @@ Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You
|
||||
IceHUD.IceCore.IceHUDFrame:Show()
|
||||
end
|
||||
end,
|
||||
hidden = not UnitCanPetBattle,
|
||||
order = 34,
|
||||
},
|
||||
|
||||
@ -396,8 +403,27 @@ Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You
|
||||
IceHUD.IceCore.IceHUDFrame:Show()
|
||||
end
|
||||
end,
|
||||
hidden = not GetBarberShopStyleInfo,
|
||||
order = 35,
|
||||
},
|
||||
|
||||
bHideDuringShellGame = {
|
||||
type = 'toggle',
|
||||
name = L["Hide during shell game"],
|
||||
desc = L["This will hide the entire mod when playing the BfA Tortollan shell game world quest."],
|
||||
width = 'double',
|
||||
get = function()
|
||||
return IceHUD.IceCore.settings.bHideDuringShellGame
|
||||
end,
|
||||
set = function(info, value)
|
||||
IceHUD.IceCore.settings.bHideDuringShellGame = value
|
||||
if not value then
|
||||
IceHUD.IceCore.IceHUDFrame:Show()
|
||||
end
|
||||
end,
|
||||
hidden = IceHUD.WowVer < 80000,
|
||||
order = 36,
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -128,8 +128,12 @@ end
|
||||
function IceStackCounter_Enable(frame)
|
||||
frame:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
|
||||
frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
|
||||
frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
|
||||
frame:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
|
||||
end
|
||||
if FocusUnit then
|
||||
frame:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
|
||||
end
|
||||
frame:RegisterEvent("PLAYER_DEAD", "UpdateCustomCount")
|
||||
frame:RegisterEvent("SPELL_UPDATE_CHARGES", "UpdateCustomCount")
|
||||
|
||||
|
@ -19,6 +19,12 @@ 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
|
||||
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function IceUnitBar.prototype:init(name, unit)
|
||||
IceUnitBar.super.prototype.init(self, name)
|
||||
@ -165,7 +171,7 @@ end
|
||||
-- Creates the low amount warning frame
|
||||
function IceUnitBar.prototype:CreateFlashFrame()
|
||||
if not (self.flashFrame) then
|
||||
self.flashFrame = CreateFrame("Frame", nil, self.frame)
|
||||
self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
|
||||
end
|
||||
|
||||
self.flashFrame:SetFrameStrata("BACKGROUND")
|
||||
@ -215,7 +221,7 @@ end
|
||||
function IceUnitBar.prototype:Update()
|
||||
IceUnitBar.super.prototype.Update(self)
|
||||
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if UnitIsTapped then
|
||||
self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
|
||||
else
|
||||
self.tapped = UnitIsTapDenied(self.unit)
|
||||
@ -225,9 +231,26 @@ function IceUnitBar.prototype:Update()
|
||||
self.maxHealth = UnitHealthMax(self.unit)
|
||||
self.healthPercentage = self.maxHealth ~= 0 and (self.health/self.maxHealth) or 0
|
||||
|
||||
-- note that UnitPowerType returns 2 arguments and UnitPower[Max] accepts a third argument to get the values on a different scale
|
||||
-- so this technically doesn't get us the answer we want most of the time. too risky to change at this point, though.
|
||||
self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
|
||||
self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
|
||||
self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
|
||||
if UnitPowerType(self.unit) == SPELL_POWER_RAGE and self.maxMana == 1000 then
|
||||
self.mana = IceHUD:MathRound(self.mana / 10)
|
||||
self.maxMana = IceHUD:MathRound(self.maxMana / 10)
|
||||
end
|
||||
if IceHUD.WowVer >= 70300 and UnitPowerType(self.unit) == SPELL_POWER_INSANITY then
|
||||
self.mana = IceHUD:MathRound(self.mana / 100)
|
||||
self.maxMana = IceHUD:MathRound(self.maxMana / 100)
|
||||
end
|
||||
|
||||
-- account for cases where maxMana is 0, perhaps briefly (during certain spells, for example)
|
||||
-- and properly handle it as full. this allows for proper alpha handling during these times.
|
||||
if self.maxMana == self.mana then
|
||||
self.manaPercentage = 1
|
||||
else
|
||||
self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
|
||||
end
|
||||
|
||||
local locClass
|
||||
locClass, self.unitClass = UnitClass(self.unit)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,5 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
|
||||
<!--@non-debug@
|
||||
<Script file="libs\LibStub\LibStub.lua"/>
|
||||
<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
|
||||
<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
|
||||
@ -18,4 +19,5 @@
|
||||
<Script file="LibDataBroker-1.1.lua"/>
|
||||
<Script file="libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
|
||||
<Script file="libs\LibDualSpec-1.0\LibDualSpec-1.0.lua"/>
|
||||
@end-non-debug@-->
|
||||
</Ui>
|
||||
|
@ -1,6 +1,11 @@
|
||||
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
|
||||
SPELL_POWER_ARCANE_CHARGES = Enum.PowerType.ArcaneCharges
|
||||
end
|
||||
|
||||
function ArcaneCharges.prototype:init()
|
||||
ArcaneCharges.super.prototype.init(self, "ArcaneCharges")
|
||||
|
||||
|
@ -4,7 +4,6 @@ local CastBar = IceCore_CreateClass(IceCastBar)
|
||||
local IceHUD = _G.IceHUD
|
||||
|
||||
CastBar.prototype.spellCastSent = nil
|
||||
CastBar.prototype.sentSpell = nil
|
||||
|
||||
-- Constructor --
|
||||
function CastBar.prototype:init()
|
||||
@ -314,8 +313,10 @@ end
|
||||
function CastBar.prototype:Enable(core)
|
||||
CastBar.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
if UnitHasVehicleUI then
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
end
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
|
||||
|
||||
self:RegisterEvent("CVAR_UPDATE", "CVarUpdate")
|
||||
@ -349,16 +350,21 @@ end
|
||||
|
||||
|
||||
function CastBar.prototype:CheckVehicle()
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
if UnitHasVehicleUI then
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function CastBar.prototype:CVarUpdate(...)
|
||||
self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
|
||||
self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000
|
||||
local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
|
||||
if recoveryOffset ~= nil then
|
||||
self.fixedLatency = tonumber(recoveryOffset) / 1000
|
||||
end
|
||||
end
|
||||
|
||||
function CastBar.prototype:Disable(core)
|
||||
@ -391,7 +397,9 @@ end
|
||||
|
||||
|
||||
function CastBar.prototype:CreateLagBar()
|
||||
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY")
|
||||
if self.lagBar == nil then
|
||||
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
|
||||
end
|
||||
|
||||
local r, g, b = self:GetColor("CastLag")
|
||||
if (self.settings.backgroundToggle) then
|
||||
@ -404,14 +412,13 @@ end
|
||||
|
||||
|
||||
-- OVERRIDE
|
||||
function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
|
||||
CastBar.super.prototype.SpellCastSent(self, event, unit, spell, rank, target, lineId)
|
||||
function CastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
|
||||
CastBar.super.prototype.SpellCastSent(self, event, unit, target, castGuid, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
|
||||
if IceHUD.WowVer < 70000 then
|
||||
self.spellCastSent = GetTime()
|
||||
end
|
||||
self.sentSpell = lineId
|
||||
end
|
||||
|
||||
-- OVERRIDE
|
||||
@ -423,32 +430,18 @@ function CastBar.prototype:SpellCastChanged(event, arg1)
|
||||
end
|
||||
|
||||
-- OVERRIDE
|
||||
function CastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
|
||||
CastBar.super.prototype.SpellCastStart(self, event, unit, spell, rank, lineId, spellId)
|
||||
if (unit ~= self.unit) then return end
|
||||
function CastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
|
||||
CastBar.super.prototype.SpellCastStart(self, event, unit, castGuid, spellId)
|
||||
if (unit ~= self.unit or not spellId) then return end
|
||||
|
||||
if not self:IsVisible() or not self.actionDuration then
|
||||
return
|
||||
end
|
||||
|
||||
if self.sentSpell ~= lineId then
|
||||
self.spellCastSent = nil
|
||||
self:UpdateLagBar()
|
||||
if IceHUD.GlobalCoolDown then
|
||||
self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
|
||||
end
|
||||
|
||||
local scale
|
||||
if self.unit == "vehicle" then
|
||||
scale = 0
|
||||
elseif self.useFixedLatency then
|
||||
scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
|
||||
else
|
||||
local now = GetTime()
|
||||
local lag = now - (self.spellCastSent or now)
|
||||
scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
|
||||
end
|
||||
|
||||
self:SetBarCoord(self.lagBar, scale, true, true)
|
||||
|
||||
self.spellCastSent = nil
|
||||
end
|
||||
|
||||
|
||||
@ -461,20 +454,45 @@ function CastBar.prototype:SpellCastChannelStart(event, unit)
|
||||
return
|
||||
end
|
||||
|
||||
self:UpdateLagBar(self.moduleSettings.reverseChannel)
|
||||
end
|
||||
|
||||
-- OVERRIDE
|
||||
function CastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
|
||||
CastBar.super.prototype.SpellCastSucceeded(self, event, unit, castGuid, spellId)
|
||||
|
||||
if not self.actionDuration or unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
|
||||
self:UpdateLagBar()
|
||||
if IceHUD.GlobalCoolDown then
|
||||
self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function CastBar.prototype:UpdateLagBar(isChannel)
|
||||
local now = GetTime()
|
||||
if self.nextLagUpdate and now <= self.nextLagUpdate then
|
||||
return
|
||||
end
|
||||
|
||||
local scale
|
||||
if self.unit == "vehicle" then
|
||||
scale = 0
|
||||
elseif self.useFixedLatency then
|
||||
scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
|
||||
else
|
||||
local now = GetTime()
|
||||
local lag = now - (self.spellCastSent or now)
|
||||
scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
|
||||
if lag >= (self.actionDuration / 2) then
|
||||
scale = 0
|
||||
else
|
||||
scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
|
||||
end
|
||||
end
|
||||
|
||||
local top = not self.moduleSettings.reverseChannel
|
||||
|
||||
self:SetBarCoord(self.lagBar, scale, top, true)
|
||||
self:SetBarCoord(self.lagBar, scale, not isChannel, true)
|
||||
|
||||
self.spellCastSent = nil
|
||||
end
|
||||
|
@ -18,7 +18,7 @@ IceClassPowerCounter.prototype.requiredSpec = nil
|
||||
IceClassPowerCounter.prototype.shouldShowUnmodified = false
|
||||
IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
|
||||
IceClassPowerCounter.prototype.unit = "player"
|
||||
|
||||
IceClassPowerCounter.prototype.round = ceil
|
||||
IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 }
|
||||
IceClassPowerCounter.prototype.currentGrowMode = nil
|
||||
|
||||
@ -465,9 +465,9 @@ end
|
||||
function IceClassPowerCounter.prototype:DisplayCounter()
|
||||
self:UnregisterEvent("PLAYER_LEVEL_UP")
|
||||
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateRunePower")
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateRunePower")
|
||||
self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateRunePower")
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
self:HideBlizz()
|
||||
@ -484,8 +484,13 @@ function IceClassPowerCounter.prototype:Disable(core)
|
||||
end
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:EnteringWorld()
|
||||
self:TargetChanged()
|
||||
self:UpdateRunePower()
|
||||
end
|
||||
|
||||
function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||
if event and (event == "UNIT_POWER" or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
|
||||
if event and (event == IceHUD.UnitPowerEvent or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
|
||||
return
|
||||
end
|
||||
|
||||
@ -501,13 +506,17 @@ 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
|
||||
self.frame.numeric:SetText(tostring(percentReady))
|
||||
if self.numericFormat then
|
||||
self.frame.numeric:SetText(format(self.numericFormat, percentReady))
|
||||
else
|
||||
self.frame.numeric:SetText(tostring(percentReady))
|
||||
end
|
||||
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
||||
end
|
||||
|
||||
if self:GetRuneMode() ~= "Numeric" then
|
||||
for i=1, self.numRunes do
|
||||
if i <= ceil(percentReady) then
|
||||
if i <= self.round(percentReady) then
|
||||
if self:GetRuneMode() == "Graphical" then
|
||||
self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
|
||||
else
|
||||
|
@ -7,12 +7,25 @@ local AnticipationSpellId = 114015
|
||||
|
||||
ComboPoints.prototype.comboSize = 20
|
||||
|
||||
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic 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)
|
||||
self.scalingEnabled = true
|
||||
end
|
||||
|
||||
@ -158,7 +171,7 @@ function ComboPoints.prototype:GetOptions()
|
||||
order = 33.2
|
||||
}
|
||||
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
opts["anticipation"] = {
|
||||
type = "toggle",
|
||||
name = L["Show Anticipation"],
|
||||
@ -210,8 +223,29 @@ function ComboPoints.prototype:GetOptions()
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
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
|
||||
|
||||
return opts
|
||||
end
|
||||
|
||||
@ -230,6 +264,7 @@ function ComboPoints.prototype:GetDefaultSettings()
|
||||
defaults["comboGap"] = 0
|
||||
defaults["showAnticipation"] = true
|
||||
defaults["bShowWithNoTarget"] = true
|
||||
defaults["bShowAnimaCharged"] = true
|
||||
return defaults
|
||||
end
|
||||
|
||||
@ -248,16 +283,20 @@ function ComboPoints.prototype:Enable(core)
|
||||
ComboPoints.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
|
||||
if IceHUD.WowVer >= 30000 then
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
||||
else
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
|
||||
if IceHUD.WowVer < 80000 then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
|
||||
end
|
||||
end
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if UnitHasVehicleUI then
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
||||
end
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation")
|
||||
self:AddAnticipation()
|
||||
end
|
||||
@ -265,11 +304,16 @@ function ComboPoints.prototype:Enable(core)
|
||||
self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer >= 90000 then
|
||||
self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
|
||||
end
|
||||
|
||||
if self.moduleSettings.comboMode == "Graphical" then
|
||||
self.moduleSettings.comboMode = "Graphical Bar"
|
||||
end
|
||||
|
||||
self:CreateComboFrame(true)
|
||||
self:UpdateChargedComboPoints()
|
||||
end
|
||||
|
||||
function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
|
||||
@ -282,6 +326,13 @@ function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
|
||||
end
|
||||
end
|
||||
|
||||
function ComboPoints.prototype:UpdateChargedComboPoints()
|
||||
local chargedPowerPoints = GetUnitChargedPowerPoints("player")
|
||||
self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
|
||||
self:CreateComboFrame()
|
||||
self:UpdateComboPoints()
|
||||
end
|
||||
|
||||
-- 'Protected' methods --------------------------------------------------------
|
||||
|
||||
-- OVERRIDE
|
||||
@ -390,7 +441,12 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
||||
if (self.moduleSettings.gradient) then
|
||||
g = g - ((1 / maxComboPoints)*i)
|
||||
end
|
||||
self.frame.graphical[i].texture:SetVertexColor(r, g, b)
|
||||
|
||||
if i == self.chargedPowerPointIndex and self.moduleSettings.bShowAnimaCharged then
|
||||
self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint"))
|
||||
else
|
||||
self.frame.graphical[i].texture:SetVertexColor(r, g, b)
|
||||
end
|
||||
|
||||
self.frame.graphical[i]:Hide()
|
||||
end
|
||||
@ -436,24 +492,24 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
||||
end
|
||||
|
||||
function ComboPoints.prototype:UpdateComboPoints(...)
|
||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
||||
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||
return
|
||||
end
|
||||
|
||||
local points, anticipate, _
|
||||
if IceHUD.IceCore:IsInConfigMode() then
|
||||
points = self:GetMaxComboPoints()
|
||||
elseif IceHUD.WowVer >= 30000 then
|
||||
elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
-- Parnic: apparently some fights have combo points while the player is in a vehicle?
|
||||
local isInVehicle = UnitHasVehicleUI("player")
|
||||
local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
|
||||
local checkUnit = isInVehicle and "vehicle" or "player"
|
||||
if IceHUD.WowVer >= 60000 then
|
||||
if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
|
||||
points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
|
||||
else
|
||||
points = GetComboPoints(checkUnit, "target")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if IceHUD.WowVer < 70000 and IceHUD.WowVer >= 50000 then
|
||||
_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||
else
|
||||
anticipate = 0
|
||||
@ -520,7 +576,12 @@ do
|
||||
|
||||
function ComboPoints.prototype:CheckAnticipation(e, unit) -- UNIT_AURA handler
|
||||
if UnitIsUnit(unit, "player") then
|
||||
local _, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||
local _, _, _, newAntStacks
|
||||
if IceHUD.WowVer < 80000 then
|
||||
_, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||
else
|
||||
_, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
|
||||
end
|
||||
if newAntStacks ~= antStacks then
|
||||
antStacks = newAntStacks
|
||||
self:UpdateComboPoints()
|
||||
@ -539,4 +600,7 @@ end
|
||||
|
||||
|
||||
-- Load us up
|
||||
IceHUD.ComboPoints = ComboPoints:new()
|
||||
local _, class = UnitClass("player")
|
||||
if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
|
||||
IceHUD.ComboPoints = ComboPoints:new()
|
||||
end
|
||||
|
@ -1,6 +1,18 @@
|
||||
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
|
||||
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")
|
||||
|
||||
@ -52,7 +64,6 @@ end
|
||||
|
||||
function ComboPointsBar.prototype:GetDefaultSettings()
|
||||
local defaults = ComboPointsBar.super.prototype.GetDefaultSettings(self)
|
||||
defaults.textVisible['lower'] = false
|
||||
defaults.offset = 8
|
||||
defaults.enabled = false
|
||||
defaults.alwaysDisplay = false
|
||||
@ -65,17 +76,31 @@ function ComboPointsBar.prototype:Enable(core)
|
||||
ComboPointsBar.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
|
||||
if IceHUD.WowVer >= 30000 then
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
|
||||
else
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
|
||||
end
|
||||
if UnitHasVehicleUI then
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
||||
end
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
|
||||
else
|
||||
self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer >= 90000 then
|
||||
self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
|
||||
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()
|
||||
@ -87,18 +112,18 @@ end
|
||||
local color = {}
|
||||
|
||||
function ComboPointsBar.prototype:UpdateComboPoints(...)
|
||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
||||
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||
return
|
||||
end
|
||||
|
||||
local points
|
||||
if IceHUD.IceCore:IsInConfigMode() then
|
||||
points = UnitPowerMax("player", SPELL_POWER_COMBO_POINTS)
|
||||
elseif IceHUD.WowVer >= 30000 then
|
||||
elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
|
||||
-- Parnic: apparently some fights have combo points while the player is in a vehicle?
|
||||
local isInVehicle = UnitHasVehicleUI("player")
|
||||
local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
|
||||
local checkUnit = isInVehicle and "vehicle" or "player"
|
||||
if IceHUD.WowVer >= 60000 then
|
||||
if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
|
||||
points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
|
||||
else
|
||||
points = GetComboPoints(checkUnit, "target")
|
||||
@ -122,10 +147,14 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
|
||||
end
|
||||
|
||||
self:SetBottomText1(points or "0")
|
||||
self:SetBottomText2(self.chargedPowerPointIndex)
|
||||
end
|
||||
|
||||
function ComboPointsBar.prototype:Update()
|
||||
self:UpdateComboPoints()
|
||||
end
|
||||
|
||||
IceHUD.ComboPointsBar = ComboPointsBar:new()
|
||||
local _, class = UnitClass("player")
|
||||
if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
|
||||
IceHUD.ComboPointsBar = ComboPointsBar:new()
|
||||
end
|
||||
|
@ -36,8 +36,12 @@ function IceCustomBar.prototype:Enable(core)
|
||||
|
||||
self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
|
||||
self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
|
||||
self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
|
||||
self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
|
||||
end
|
||||
if FocusUnit then
|
||||
self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
|
||||
end
|
||||
if self.unitClass == "SHAMAN" then
|
||||
self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotems")
|
||||
end
|
||||
@ -77,6 +81,10 @@ function IceCustomBar.prototype:Disable(core)
|
||||
end
|
||||
|
||||
function IceCustomBar.prototype:GetUnitToTrack()
|
||||
if IceHUD.WowClassic then
|
||||
return "player"
|
||||
end
|
||||
|
||||
if self.moduleSettings.myUnit == "other" then
|
||||
if self.moduleSettings.customUnit ~= nil and self.moduleSettings.customUnit ~= "" then
|
||||
return self.moduleSettings.customUnit
|
||||
@ -167,8 +175,6 @@ function IceCustomBar.prototype:CreateBar()
|
||||
|
||||
if not self.barFrame.icon then
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
|
||||
-- default texture so that 'config mode' can work without activating the bar first
|
||||
self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
|
||||
-- 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")
|
||||
@ -256,51 +262,53 @@ function IceCustomBar.prototype:GetOptions()
|
||||
order = 30.3,
|
||||
}
|
||||
|
||||
opts["unitToTrack"] = {
|
||||
type = 'select',
|
||||
values = validUnits,
|
||||
name = L["Unit to track"],
|
||||
desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
|
||||
get = function(info)
|
||||
return IceHUD:GetSelectValue(info, self.moduleSettings.myUnit)
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.myUnit = info.option.values[v]
|
||||
self.unit = self:GetUnitToTrack()
|
||||
self:RegisterFontStrings()
|
||||
self:ConditionalSubscribe()
|
||||
self:Redraw()
|
||||
self:UpdateCustomBar(self.unit)
|
||||
IceHUD:NotifyOptionsChange()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 30.4,
|
||||
}
|
||||
if not IceHUD.WowClassic then
|
||||
opts["unitToTrack"] = {
|
||||
type = 'select',
|
||||
values = validUnits,
|
||||
name = L["Unit to track"],
|
||||
desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
|
||||
get = function(info)
|
||||
return IceHUD:GetSelectValue(info, self.moduleSettings.myUnit)
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.myUnit = info.option.values[v]
|
||||
self.unit = self:GetUnitToTrack()
|
||||
self:RegisterFontStrings()
|
||||
self:ConditionalSubscribe()
|
||||
self:Redraw()
|
||||
self:UpdateCustomBar(self.unit)
|
||||
IceHUD:NotifyOptionsChange()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 30.4,
|
||||
}
|
||||
|
||||
opts["customUnitToTrack"] = {
|
||||
type = 'input',
|
||||
name = L["Custom unit"],
|
||||
desc = L["Any valid unit id such as: party1, raid14, targettarget, etc. Not guaranteed to work with all unit ids.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
|
||||
get = function()
|
||||
return self.moduleSettings.customUnit
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.customUnit = v
|
||||
self.unit = self:GetUnitToTrack()
|
||||
self:RegisterFontStrings()
|
||||
self:ConditionalSubscribe()
|
||||
self:Redraw()
|
||||
self:UpdateCustomBar(self.unit)
|
||||
IceHUD:NotifyOptionsChange()
|
||||
end,
|
||||
hidden = function()
|
||||
return self.moduleSettings.myUnit ~= "other"
|
||||
end,
|
||||
usage = "<what custom unit to track when unitToTrack is set to 'other'>",
|
||||
order = 30.45,
|
||||
}
|
||||
opts["customUnitToTrack"] = {
|
||||
type = 'input',
|
||||
name = L["Custom unit"],
|
||||
desc = L["Any valid unit id such as: party1, raid14, targettarget, etc. Not guaranteed to work with all unit ids.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
|
||||
get = function()
|
||||
return self.moduleSettings.customUnit
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.customUnit = v
|
||||
self.unit = self:GetUnitToTrack()
|
||||
self:RegisterFontStrings()
|
||||
self:ConditionalSubscribe()
|
||||
self:Redraw()
|
||||
self:UpdateCustomBar(self.unit)
|
||||
IceHUD:NotifyOptionsChange()
|
||||
end,
|
||||
hidden = function()
|
||||
return self.moduleSettings.myUnit ~= "other"
|
||||
end,
|
||||
usage = "<what custom unit to track when unitToTrack is set to 'other'>",
|
||||
order = 30.45,
|
||||
}
|
||||
end
|
||||
|
||||
opts["buffOrDebuff"] = {
|
||||
type = 'select',
|
||||
@ -633,7 +641,7 @@ end
|
||||
-- 'Protected' methods --------------------------------------------------------
|
||||
|
||||
function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
|
||||
if not unitName or not buffName then
|
||||
if not unitName or not buffName or buffName == "" then
|
||||
return nil
|
||||
end
|
||||
|
||||
@ -664,7 +672,12 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
|
||||
local remaining
|
||||
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 = UnitAura(unitName, i, buffFilter)
|
||||
local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
else
|
||||
buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
end
|
||||
local isMine = unitCaster == "player"
|
||||
local mySpellId = tonumber(self.moduleSettings.buffToTrack)
|
||||
local checkId = mySpellId ~= nil
|
||||
@ -690,7 +703,11 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
else
|
||||
buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
|
||||
end
|
||||
isMine = unitCaster == "player"
|
||||
end
|
||||
|
||||
@ -765,6 +782,10 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
|
||||
end
|
||||
|
||||
if IceHUD.IceCore:IsInConfigMode() or self.moduleSettings.displayAuraIcon then
|
||||
if IceHUD.IceCore:IsInConfigMode() and not self.barFrame.icon:GetTexture() then
|
||||
self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
|
||||
end
|
||||
|
||||
self.barFrame.icon:Show()
|
||||
else
|
||||
self.barFrame.icon:Hide()
|
||||
|
@ -21,11 +21,6 @@ IceCustomCDBar.prototype.cooldownDuration = 0
|
||||
IceCustomCDBar.prototype.cooldownEndTime = 0
|
||||
IceCustomCDBar.prototype.coolingDown = false
|
||||
|
||||
-- super temp...remove this when blizzard fixes these spells to work by name with GetSpellCooldown()
|
||||
local brokenSpellsNameToId = {}
|
||||
table.insert(brokenSpellsNameToId, {"Holy Word: Serenity",88684})
|
||||
table.insert(brokenSpellsNameToId, {"Holy Word: Sanctuary",88685})
|
||||
|
||||
-- Constructor --
|
||||
function IceCustomCDBar.prototype:init()
|
||||
IceCustomCDBar.super.prototype.init(self, "MyCustomCDBar")
|
||||
@ -137,8 +132,6 @@ function IceCustomCDBar.prototype:CreateBar()
|
||||
|
||||
if not self.barFrame.icon then
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
|
||||
-- default texture so that 'config mode' can work without activating the bar first
|
||||
self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
|
||||
-- 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")
|
||||
@ -680,6 +673,9 @@ function IceCustomCDBar.prototype:UpdateIcon()
|
||||
end
|
||||
|
||||
if IceHUD.IceCore:IsInConfigMode() or self.moduleSettings.displayAuraIcon then
|
||||
if not self.barFrame.icon:GetTexture() and IceHUD.IceCore:IsInConfigMode() then
|
||||
self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
|
||||
end
|
||||
self.barFrame.icon:Show()
|
||||
else
|
||||
self.barFrame.icon:Hide()
|
||||
@ -699,7 +695,10 @@ function IceCustomCDBar.prototype:UpdateItemUnitInventoryChanged(event, unit)
|
||||
end
|
||||
end
|
||||
|
||||
function IceCustomCDBar.prototype:UpdateCustomBarEvent()
|
||||
function IceCustomCDBar.prototype:UpdateCustomBarEvent(event, unit)
|
||||
if unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
|
||||
self:UpdateCustomBar()
|
||||
end
|
||||
@ -727,6 +726,8 @@ function IceCustomCDBar.prototype:UpdateCustomBar(fromUpdate)
|
||||
else
|
||||
self.cooldownEndTime = remaining + now
|
||||
end
|
||||
|
||||
self:UpdateIcon()
|
||||
end
|
||||
|
||||
if self.cooldownEndTime and self.cooldownEndTime >= now then
|
||||
@ -801,7 +802,9 @@ function IceCustomCDBar.prototype:IsReady()
|
||||
local checkSpell = self:GetSpellNameOrId(self.moduleSettings.cooldownToTrack)
|
||||
|
||||
if (IsUsableSpell(checkSpell)) then
|
||||
if (not self.moduleSettings.bIgnoreRange and SpellHasRange(checkSpell)) or (self.moduleSettings.bOnlyShowWithTarget) then
|
||||
if self.moduleSettings.bIgnoreRange and self.moduleSettings.bOnlyShowWithTarget then
|
||||
is_ready = UnitExists("target") and 1 or nil
|
||||
elseif (not self.moduleSettings.bIgnoreRange and SpellHasRange(checkSpell)) or (self.moduleSettings.bOnlyShowWithTarget) then
|
||||
if (UnitExists("target") and (not SpellHasRange(checkSpell) or IsSpellInRange(checkSpell, "target") == 1))
|
||||
or (not UnitExists("target") and not self.moduleSettings.bOnlyShowWithTarget and IsSpellInRange(checkSpell, "player")) then
|
||||
is_ready = 1
|
||||
@ -821,14 +824,6 @@ function IceCustomCDBar.prototype:IsReady()
|
||||
end
|
||||
|
||||
function IceCustomCDBar.prototype:GetSpellNameOrId(spellName)
|
||||
-- super temp hax. certain spells (the new 'morphing' spells) do not work by name with GetSpellCooldown(), only id.
|
||||
for i=1,#brokenSpellsNameToId do
|
||||
if spellName == brokenSpellsNameToId[i][1] then
|
||||
spellName = brokenSpellsNameToId[i][2]
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
return spellName
|
||||
end
|
||||
|
||||
|
@ -122,7 +122,7 @@ function IceCustomCount.prototype:GetOptions()
|
||||
self.moduleSettings.vpos = v
|
||||
self:Redraw()
|
||||
end,
|
||||
min = -400,
|
||||
min = -700,
|
||||
max = 700,
|
||||
step = 1,
|
||||
disabled = function()
|
||||
@ -245,6 +245,23 @@ function IceCustomCount.prototype:GetOptions()
|
||||
order = 34
|
||||
}
|
||||
|
||||
opts["showWhenZero"] = {
|
||||
type = 'toggle',
|
||||
name = L["Show when zero"],
|
||||
desc = L["Whether or not to show the counter when the value is zero. This will cause a 0 to be displayed at all times for Numeric mode and faded markers for graphical mode."],
|
||||
get = function()
|
||||
return self.moduleSettings.showWhenZero
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.showWhenZero = v
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 35,
|
||||
}
|
||||
|
||||
return opts
|
||||
end
|
||||
|
||||
@ -426,7 +443,7 @@ function IceCustomCount.prototype:GetGradientColor(curr)
|
||||
local r, g, b = self:GetCustomColor()
|
||||
local mr, mg, mb = self:GetCustomMinColor()
|
||||
local scale = max > 1 and ((curr-1)/(max-1)) or 1
|
||||
if self.moduleSettings.countMode == "Numeric" then
|
||||
if self.moduleSettings.countMode == "Numeric" and self.moduleSettings.showWhenZero then
|
||||
scale = max > 1 and (curr/max) or 1
|
||||
end
|
||||
|
||||
@ -443,7 +460,10 @@ function IceCustomCount.prototype:UpdateCustomCount()
|
||||
return
|
||||
end
|
||||
|
||||
local points = IceStackCounter_GetCount(self) or 0
|
||||
local points = IceStackCounter_GetCount(self)
|
||||
if not points and self.moduleSettings.showWhenZero then
|
||||
points = 0
|
||||
end
|
||||
local max = IceStackCounter_GetMaxCount(self)
|
||||
|
||||
if max > #self.frame.graphical then
|
||||
|
@ -278,7 +278,6 @@ function IceCustomCounterBar.prototype:CreateFrame()
|
||||
|
||||
if not self.barFrame.icon then
|
||||
self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
|
||||
self.barFrame.icon:SetTexture(DefaultAuraIcon)
|
||||
self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
|
||||
self.barFrame.icon:SetDrawLayer("OVERLAY")
|
||||
self.barFrame.icon:Hide()
|
||||
@ -306,10 +305,6 @@ function IceCustomCounterBar.prototype:UpdateAuraIcon()
|
||||
local auraIcon, _
|
||||
_, _, auraIcon = GetSpellInfo(self.moduleSettings.auraName)
|
||||
|
||||
if auraIcon == nil then
|
||||
auraIcon = "Interface\\Icons\\Spell_Frost_Frost"
|
||||
end
|
||||
|
||||
self.barFrame.icon:SetTexture(auraIcon)
|
||||
end
|
||||
|
||||
@ -319,6 +314,10 @@ function IceCustomCounterBar.prototype:UpdateCustomCount()
|
||||
local percent = IceHUD:Clamp(1.0 * points / (max > 0 and max or 1), 0, 1)
|
||||
|
||||
if IceHUD.IceCore:IsInConfigMode() then
|
||||
if not self.barFrame.icon:GetTexture() then
|
||||
self.barFrame.icon:SetTexture(DefaultAuraIcon)
|
||||
end
|
||||
|
||||
points = IceStackCounter_GetMaxCount(self)
|
||||
percent = 1
|
||||
self.barFrame.icon:Show()
|
||||
|
@ -107,7 +107,7 @@ function EclipseBar.prototype:CreateFrame()
|
||||
end
|
||||
|
||||
function EclipseBar.prototype:CreateSolarBar()
|
||||
self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK")
|
||||
self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK", "Solar")
|
||||
self:SetBarCoord(self.solarBar, 0.5, true)
|
||||
|
||||
self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))
|
||||
|
@ -26,4 +26,6 @@ function FocusAbsorb.prototype:MyUnregisterCustomEvents()
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
IceHUD.FocusAbsorb = FocusAbsorb:new()
|
||||
if UnitGetTotalAbsorbs ~= nil then
|
||||
IceHUD.FocusAbsorb = FocusAbsorb:new()
|
||||
end
|
||||
|
@ -23,4 +23,6 @@ end
|
||||
-- 'Protected' methods --------------------------------------------------------
|
||||
|
||||
-- Load us up
|
||||
IceHUD.FocusCC = FocusCC:new()
|
||||
if FocusUnit then
|
||||
IceHUD.FocusCC = FocusCC:new()
|
||||
end
|
||||
|
@ -112,4 +112,6 @@ end
|
||||
|
||||
|
||||
-- Load us up
|
||||
IceHUD.FocusCast = FocusCast:new()
|
||||
if FocusUnit then
|
||||
IceHUD.FocusCast = FocusCast:new()
|
||||
end
|
||||
|
@ -471,4 +471,6 @@ function FocusHealth.prototype:HideBlizz()
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
IceHUD.FocusHealth = FocusHealth:new()
|
||||
if FocusUnit then
|
||||
IceHUD.FocusHealth = FocusHealth:new()
|
||||
end
|
||||
|
@ -1,6 +1,14 @@
|
||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
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
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function FocusMana.prototype:init()
|
||||
@ -32,8 +40,10 @@ function FocusMana.prototype:Enable(core)
|
||||
FocusMana.super.prototype.Enable(self, core)
|
||||
|
||||
if IceHUD.WowVer >= 40000 then
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
self:RegisterEvent("UNIT_MANA", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||
@ -126,4 +136,6 @@ end
|
||||
|
||||
|
||||
-- Load us up
|
||||
IceHUD.FocusMana = FocusMana:new()
|
||||
if FocusUnit then
|
||||
IceHUD.FocusMana = FocusMana:new()
|
||||
end
|
||||
|
@ -16,4 +16,6 @@ function IceFocusThreat.prototype:GetDefaultSettings()
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
IceHUD.IceFocusThreat = IceFocusThreat:new()
|
||||
if FocusUnit then
|
||||
IceHUD.IceFocusThreat = IceFocusThreat:new()
|
||||
end
|
||||
|
@ -20,7 +20,7 @@ function GlobalCoolDown.prototype:Enable(core)
|
||||
self.moduleSettings.inverse = "NORMAL"
|
||||
end
|
||||
|
||||
self:RegisterEvent("UNIT_SPELLCAST_SENT","SpellCastSent")
|
||||
self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
|
||||
|
||||
--self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
|
||||
self:RegisterEvent("UNIT_SPELLCAST_START","CooldownStateChanged")
|
||||
@ -45,7 +45,10 @@ end
|
||||
|
||||
function GlobalCoolDown.prototype:CVarUpdate()
|
||||
self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
|
||||
self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000.0
|
||||
local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
|
||||
if recoveryOffset ~= nil then
|
||||
self.fixedLatency = tonumber(recoveryOffset) / 1000.0
|
||||
end
|
||||
end
|
||||
|
||||
-- OVERRIDE
|
||||
@ -140,20 +143,16 @@ function GlobalCoolDown.prototype:IsFull(scale)
|
||||
return false
|
||||
end
|
||||
|
||||
function GlobalCoolDown.prototype:SpellCastSent(event, unit, spell)
|
||||
if unit ~= "player" or not spell then
|
||||
return
|
||||
end
|
||||
|
||||
function GlobalCoolDown.prototype:SpellCastChanged(event, cancelled)
|
||||
self.spellCastSent = GetTime()
|
||||
end
|
||||
|
||||
function GlobalCoolDown.prototype:SpellCastStop(event, unit, spell, _, _, spellId)
|
||||
if unit ~= "player" or not spellId or not self.CurrSpellId or self.CurrSpellId ~= spellId then
|
||||
function GlobalCoolDown.prototype:SpellCastStop(event, unit, castGuid, spellId)
|
||||
if unit ~= "player" or not spellId or not self.CurrSpellGuid or self.CurrSpellGuid ~= castGuid then
|
||||
return
|
||||
end
|
||||
|
||||
self.CurrSpellId = nil
|
||||
self.CurrSpellGuid = nil
|
||||
|
||||
if event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED" then
|
||||
self.CurrLerpTime = self.moduleSettings.desiredLerpTime
|
||||
@ -179,19 +178,19 @@ function GlobalCoolDown.prototype:GetSpellCastTime(spell)
|
||||
end
|
||||
end
|
||||
|
||||
function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell, _, _, spellId)
|
||||
function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, castGuid, spellId)
|
||||
if unit ~= "player" or not spellId then
|
||||
return
|
||||
end
|
||||
|
||||
-- Ignore all events unrelated to the spell currently being cast
|
||||
if self.CurrSpellId and self.CurrSpellId ~= spellId then
|
||||
if self.CurrSpellGuid and self.CurrSpellGuid ~= castGuid then
|
||||
return
|
||||
end
|
||||
|
||||
-- Update the current spell ID for all events indicating a spellcast is starting
|
||||
if event ~= "UNIT_SPELLCAST_SUCCEEDED" then
|
||||
self.CurrSpellId = spellId
|
||||
self.CurrSpellGuid = castGuid
|
||||
end
|
||||
|
||||
local start, dur = GetSpellCooldown(self.CDSpellId)
|
||||
@ -256,7 +255,7 @@ function GlobalCoolDown.prototype:CreateFrame()
|
||||
end
|
||||
|
||||
function GlobalCoolDown.prototype:CreateLagBar()
|
||||
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY")
|
||||
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
|
||||
|
||||
local r, g, b = self:GetColor("CastLag")
|
||||
if (self.settings.backgroundToggle) then
|
||||
@ -292,4 +291,6 @@ function GlobalCoolDown.prototype:GetSpellId()
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
IceHUD.GlobalCoolDown = GlobalCoolDown:new()
|
||||
if not IceHUD.WowClassic then
|
||||
IceHUD.GlobalCoolDown = GlobalCoolDown:new()
|
||||
end
|
||||
|
@ -1,10 +1,15 @@
|
||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local HarmonyPower = IceCore_CreateClass(IceClassPowerCounter)
|
||||
|
||||
function HarmonyPower.prototype:init()
|
||||
HarmonyPower.super.prototype.init(self, "HarmonyPower")
|
||||
local SPELL_POWER_CHI = SPELL_POWER_CHI
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_CHI = Enum.PowerType.Chi
|
||||
end
|
||||
|
||||
self:SetDefaultColor("HarmonyPowerNumeric", 218, 231, 31)
|
||||
function HarmonyPower.prototype:init()
|
||||
HarmonyPower.super.prototype.init(self, "Chi")
|
||||
|
||||
self:SetDefaultColor("ChiNumeric", 218, 231, 31)
|
||||
|
||||
-- pulled from MonkHarmonyBar.xml in Blizzard's UI source
|
||||
self.runeCoords =
|
||||
@ -17,7 +22,7 @@ function HarmonyPower.prototype:init()
|
||||
{0.00390625, 0.08593750, 0.71093750, 0.87500000},
|
||||
}
|
||||
self.numRunes = 4
|
||||
self.numericColor = "HarmonyPowerNumeric"
|
||||
self.numericColor = "ChiNumeric"
|
||||
if IceHUD.WowVer >= 50100 then
|
||||
self.unitPower = SPELL_POWER_CHI
|
||||
else
|
||||
|
@ -1,6 +1,11 @@
|
||||
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
|
||||
SPELL_POWER_HOLY_POWER = Enum.PowerType.HolyPower
|
||||
end
|
||||
|
||||
function HolyPower.prototype:init()
|
||||
HolyPower.super.prototype.init(self, "HolyPower")
|
||||
|
||||
@ -27,7 +32,7 @@ function HolyPower.prototype:init()
|
||||
self.numericColor = "HolyPowerNumeric"
|
||||
self.unitPower = SPELL_POWER_HOLY_POWER
|
||||
self.minLevel = PALADINPOWERBAR_SHOW_LEVEL
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 90000 then
|
||||
self.requiredSpec = SPEC_PALADIN_RETRIBUTION
|
||||
end
|
||||
self.bTreatEmptyAsFull = true
|
||||
|
@ -280,8 +280,8 @@ function MirrorBarHandler.prototype:GetOptions()
|
||||
type='range',
|
||||
name = L["Bar vertical offset"],
|
||||
desc = L["Adjust the vertical placement of this bar"],
|
||||
min = -400,
|
||||
max = 400,
|
||||
min = -600,
|
||||
max = 600,
|
||||
step = 1,
|
||||
get = function()
|
||||
return self.moduleSettings.barVerticalOffset
|
||||
|
@ -42,16 +42,23 @@ function PetHealth.prototype:Enable(core)
|
||||
PetHealth.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PET_UI_UPDATE", "CheckPet");
|
||||
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
|
||||
self:RegisterEvent("PET_BAR_CHANGED", "CheckPet");
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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
|
||||
self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
|
||||
end
|
||||
self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
|
||||
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
|
||||
if UnitHasVehicleUI then
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
end
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
|
||||
self.frame:SetAttribute("unit", self.unit)
|
||||
RegisterUnitWatch(self.frame)
|
||||
@ -217,11 +224,16 @@ function PetHealth.prototype:ExitingVehicle(event, unit)
|
||||
end
|
||||
end
|
||||
|
||||
function PetHealth.prototype:CheckVehicle()
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
function PetHealth.prototype:EnteringWorld()
|
||||
self:TargetChanged()
|
||||
self:Update(self.unit)
|
||||
|
||||
if UnitHasVehicleUI then
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -1,6 +1,17 @@
|
||||
local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local PetMana = IceCore_CreateClass(IceUnitBar)
|
||||
|
||||
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||
local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function PetMana.prototype:init()
|
||||
PetMana.super.prototype.init(self, "PetMana", "pet")
|
||||
@ -51,13 +62,17 @@ function PetMana.prototype:Enable(core)
|
||||
PetMana.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PET_UI_UPDATE", "CheckPet")
|
||||
self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
|
||||
self:RegisterEvent("PET_BAR_CHANGED", "CheckPet")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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("UNIT_PET", "CheckPet")
|
||||
|
||||
if IceHUD.WowVer >= 40000 then
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
self:RegisterEvent("UNIT_MANA", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||
@ -71,9 +86,11 @@ function PetMana.prototype:Enable(core)
|
||||
|
||||
self:RegisterEvent("UNIT_DISPLAYPOWER", "ManaType")
|
||||
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
|
||||
if UnitHasVehicleUI then
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
end
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
|
||||
self:CheckPet()
|
||||
self:ManaType(nil, self.unit)
|
||||
@ -224,11 +241,16 @@ function PetMana.prototype:ExitingVehicle(event, unit)
|
||||
end
|
||||
end
|
||||
|
||||
function PetMana.prototype:CheckVehicle()
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
function PetMana.prototype:EnteringWorld()
|
||||
self:TargetChanged()
|
||||
self:Update(self.unit)
|
||||
|
||||
if UnitHasVehicleUI then
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -19,4 +19,6 @@ function PlayerAbsorb.prototype:GetDefaultSettings()
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
IceHUD.PlayerAbsorb = PlayerAbsorb:new()
|
||||
if UnitGetTotalAbsorbs ~= nil then
|
||||
IceHUD.PlayerAbsorb = PlayerAbsorb:new()
|
||||
end
|
||||
|
@ -6,6 +6,13 @@ PlayerAltMana.prototype.PlayerAltManaMax = nil
|
||||
|
||||
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
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function PlayerAltMana.prototype:init()
|
||||
PlayerAltMana.super.prototype.init(self, "PlayerAltMana", "player")
|
||||
@ -76,6 +83,7 @@ function PlayerAltMana.prototype:Update()
|
||||
|
||||
self.PlayerAltMana = UnitPower(self.unit, SPELL_POWER_MANA)
|
||||
self.PlayerAltManaMax = UnitPowerMax(self.unit, SPELL_POWER_MANA)
|
||||
self.PlayerAltManaPercentage = self.PlayerAltManaMax ~= 0 and (self.PlayerAltMana/self.PlayerAltManaMax) or 0
|
||||
|
||||
if (not self.alive or not ShouldShow(self.unit) or not self.PlayerAltMana or not self.PlayerAltManaMax or self.PlayerAltManaMax == 0) then
|
||||
self:Show(false)
|
||||
@ -84,6 +92,16 @@ function PlayerAltMana.prototype:Update()
|
||||
self:Show(true)
|
||||
end
|
||||
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||
self:SetBottomText1(math.floor(self.PlayerAltManaPercentage * 100))
|
||||
|
||||
if (self.PlayerAltManaMax ~= 100) then
|
||||
self:SetBottomText2(self:GetFormattedText(self:Round(self.PlayerAltMana), self:Round(self.PlayerAltManaMax)), "PlayerMana")
|
||||
else
|
||||
self:SetBottomText2()
|
||||
end
|
||||
end
|
||||
|
||||
self:UpdateBar(self.PlayerAltManaMax ~= 0 and self.PlayerAltMana / self.PlayerAltManaMax or 0, "PlayerAltMana")
|
||||
end
|
||||
|
||||
|
@ -28,8 +28,10 @@ end
|
||||
function IceHUDPlayerAlternatePower.prototype:Enable(core)
|
||||
IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
|
||||
self:RegisterEvent("UNIT_POWER_BAR_HIDE", "PowerBarHide")
|
||||
|
||||
@ -130,4 +132,6 @@ function IceHUDPlayerAlternatePower.prototype:HideBlizz()
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
|
||||
if ALTERNATE_POWER_INDEX then
|
||||
IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
|
||||
end
|
||||
|
@ -68,6 +68,9 @@ function PlayerHealth.prototype:Enable(core)
|
||||
PlayerHealth.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
|
||||
if IceHUD.WowVer < 90000 then
|
||||
self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
|
||||
end
|
||||
self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
|
||||
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
@ -78,14 +81,16 @@ function PlayerHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("PLAYER_REGEN_DISABLED", "CheckCombat")
|
||||
|
||||
self:RegisterEvent("PARTY_LEADER_CHANGED", "CheckLeader")
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
|
||||
self:RegisterEvent("GROUP_ROSTER_UPDATE", "CheckLeader")
|
||||
else
|
||||
self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckLeader")
|
||||
end
|
||||
self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
|
||||
if GetLFGProposal then
|
||||
self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
|
||||
end
|
||||
|
||||
--self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckPartyFrameStatus")
|
||||
|
||||
@ -95,8 +100,10 @@ function PlayerHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("PLAYER_FLAGS_CHANGED", "CheckPvP")
|
||||
self:RegisterEvent("UNIT_FACTION", "CheckPvP")
|
||||
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
if UnitHasVehicleUI then
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer < 40000 then
|
||||
HealComm = LibStub("LibHealComm-4.0", true)
|
||||
@ -111,7 +118,9 @@ function PlayerHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("UNIT_HEAL_PREDICTION", "IncomingHealPrediction")
|
||||
end
|
||||
|
||||
self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
|
||||
if UnitGetTotalAbsorbs then
|
||||
self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
|
||||
end
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
self:HideBlizz()
|
||||
@ -927,7 +936,7 @@ function PlayerHealth.prototype:CreateBackground(redraw)
|
||||
end
|
||||
|
||||
function PlayerHealth.prototype:CreateHealBar()
|
||||
self.healFrame = self:BarFactory(self.healFrame, "LOW","BACKGROUND")
|
||||
self.healFrame = self:BarFactory(self.healFrame, "LOW","BACKGROUND", "Heal")
|
||||
|
||||
self.healFrame.bar:SetVertexColor(self:GetColor("PlayerHealthHealAmount", self.alpha * self.moduleSettings.healAlpha))
|
||||
|
||||
@ -939,7 +948,7 @@ function PlayerHealth.prototype:CreateHealBar()
|
||||
end
|
||||
|
||||
function PlayerHealth.prototype:CreateAbsorbBar()
|
||||
self.absorbFrame = self:BarFactory(self.absorbFrame, "LOW","BACKGROUND")
|
||||
self.absorbFrame = self:BarFactory(self.absorbFrame, "LOW","BACKGROUND", "Absorb")
|
||||
|
||||
self.absorbFrame.bar:SetVertexColor(self:GetColor("PlayerHealthAbsorbAmount", self.alpha * self.moduleSettings.absorbAlpha))
|
||||
|
||||
@ -994,10 +1003,12 @@ function PlayerHealth.prototype:EnteringWorld()
|
||||
end
|
||||
|
||||
function PlayerHealth.prototype:CheckVehicle()
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
if UnitHasVehicleUI then
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -1078,9 +1089,9 @@ function PlayerHealth.prototype:CheckPartyRole()
|
||||
if configMode or IceHUD:GetIsInLFGGroup() then
|
||||
if (configMode or self.moduleSettings.showPartyRoleIcon) and not self.frame.PartyRoleIcon then
|
||||
local isTank, isHeal, isDPS
|
||||
local proposalExists, typeID, id, name
|
||||
local proposalExists, typeID, id, subtypeID, name
|
||||
local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
|
||||
proposalExists, typeID, id, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||
proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||
|
||||
local p = self.unit
|
||||
if IceHUD.WowVer < 40000 then
|
||||
@ -1096,7 +1107,7 @@ function PlayerHealth.prototype:CheckPartyRole()
|
||||
IceHUD:Debug( tostring(proposalExists) .."**".. tostring(typeID) .."**".. tostring(id) .."**".. tostring(name) .."**".. tostring(texture) .."**".. tostring(role) .."**".. tostring(hasResponded) .."**".. tostring(totalEncounters) .."**".. tostring(completedEncounters) .."**".. tostring(numMembers) .."**".. tostring(isleader) )
|
||||
|
||||
if proposalExists == true then
|
||||
IceHUD:Debug(tostring(typeID).." "..role)
|
||||
IceHUD:Debug(tostring(typeID).." "..(role or ""))
|
||||
isTank = (role == "TANK")
|
||||
isHeal = (role == "HEALER")
|
||||
isDPS = (role == "DAMAGER")
|
||||
@ -1160,7 +1171,7 @@ end
|
||||
|
||||
function PlayerHealth.prototype:CheckLeader()
|
||||
local isLeader
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if UnitIsGroupLeader then
|
||||
isLeader = UnitIsGroupLeader("player")
|
||||
else
|
||||
isLeader = IsPartyLeader()
|
||||
|
@ -3,6 +3,29 @@ local PlayerMana = IceCore_CreateClass(IceUnitBar)
|
||||
|
||||
local IceHUD = _G.IceHUD
|
||||
|
||||
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||
local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
|
||||
local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
|
||||
local SPELL_POWER_FURY = SPELL_POWER_FURY
|
||||
local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
|
||||
local SPELL_POWER_PAIN = SPELL_POWER_PAIN
|
||||
local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
|
||||
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||
SPELL_POWER_FURY = Enum.PowerType.Fury
|
||||
SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
|
||||
SPELL_POWER_PAIN = Enum.PowerType.Pain
|
||||
SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
|
||||
end
|
||||
|
||||
PlayerMana.prototype.manaType = nil
|
||||
PlayerMana.prototype.tickStart = nil
|
||||
PlayerMana.prototype.previousEnergy = nil
|
||||
@ -18,9 +41,9 @@ function PlayerMana.prototype:init()
|
||||
self:SetDefaultColor("PlayerRunicPower", 62, 54, 152)
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
self:SetDefaultColor("PlayerInsanity", 150, 50, 255)
|
||||
self:SetDefaultColor("PlayerFury", 255, 50, 255)
|
||||
self:SetDefaultColor("PlayerFury", 201, 66, 253)
|
||||
self:SetDefaultColor("PlayerMaelstrom", 62, 54, 152)
|
||||
self:SetDefaultColor("PlayerPain", 255, 50, 255)
|
||||
self:SetDefaultColor("PlayerPain", 255, 156, 0)
|
||||
end
|
||||
end
|
||||
|
||||
@ -130,9 +153,11 @@ function PlayerMana.prototype:Enable(core)
|
||||
|
||||
self:CreateTickerFrame()
|
||||
|
||||
if IceHUD.WowVer >= 40000 then
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
|
||||
@ -145,8 +170,10 @@ function PlayerMana.prototype:Enable(core)
|
||||
self:RegisterEvent("UNIT_RUNIC_POWER", "UpdateEvent")
|
||||
end
|
||||
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
if UnitHasVehicleUI then
|
||||
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
|
||||
end
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
|
||||
if not self.CustomOnUpdate then
|
||||
@ -166,10 +193,12 @@ function PlayerMana.prototype:EnteringWorld()
|
||||
end
|
||||
|
||||
function PlayerMana.prototype:CheckVehicle()
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
if UnitHasVehicleUI then
|
||||
if UnitHasVehicleUI("player") then
|
||||
self:EnteringVehicle(nil, "player", true)
|
||||
else
|
||||
self:ExitingVehicle(nil, "player")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -271,6 +300,14 @@ function PlayerMana.prototype:TreatEmptyAsFull()
|
||||
or self.manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_PAIN or self.manaType == SPELL_POWER_MAELSTROM))
|
||||
end
|
||||
|
||||
function PlayerMana.prototype:IsFull(scale)
|
||||
if IceHUD.WowVer >= 80000 and self.manaType == SPELL_POWER_LUNAR_POWER and IsPlayerSpell(202430) then
|
||||
return scale - 0.5 >= 0
|
||||
end
|
||||
|
||||
return PlayerMana.super.prototype.IsFull(self, scale)
|
||||
end
|
||||
|
||||
function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
|
||||
self:Update(unit, powertype)
|
||||
end
|
||||
@ -350,7 +387,7 @@ function PlayerMana.prototype:Update(unit, powertype)
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() then
|
||||
-- extra hack for whiny rogues (are there other kind?)
|
||||
local displayPercentage = self.manaPercentage
|
||||
if (self.manaType == SPELL_POWER_ENERGY) then
|
||||
if self.manaType == SPELL_POWER_ENERGY or self.manaType == SPELL_POWER_FOCUS or self.manaType == SPELL_POWER_FURY then
|
||||
displayPercentage = self.mana
|
||||
else
|
||||
displayPercentage = math.floor(displayPercentage * 100)
|
||||
@ -382,17 +419,17 @@ function PlayerMana.prototype:UpdateEnergy(event, unit)
|
||||
return
|
||||
end
|
||||
|
||||
self.previousEnergy = UnitPower(self.unit, UnitPowerType(self.unit))
|
||||
if IceHUD.WowVer < 40000 then
|
||||
self:Update(unit)
|
||||
end
|
||||
|
||||
if self:ShouldUseTicker() and
|
||||
((not (self.previousEnergy) or (self.previousEnergy <= UnitPower(self.unit, UnitPowerType(self.unit)))) and
|
||||
((not (self.previousEnergy) or (self.previousEnergy < UnitPower(self.unit, UnitPowerType(self.unit)))) and
|
||||
(self.moduleSettings.tickerEnabled) and self.manaType == SPELL_POWER_ENERGY) then
|
||||
self.tickStart = GetTime()
|
||||
self.tickerFrame:Show()
|
||||
end
|
||||
|
||||
self.previousEnergy = UnitPower(self.unit, UnitPowerType(self.unit))
|
||||
if IceHUD.WowVer < 40000 then
|
||||
self:Update(unit)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
@ -56,7 +56,7 @@ do
|
||||
return
|
||||
end
|
||||
|
||||
self.current = select(15, UnitAura(self.unit, spellName)) or 0
|
||||
self.current = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 15 or 14, UnitAura(self.unit, spellName)) or 0
|
||||
|
||||
self:Update()
|
||||
end
|
||||
|
@ -9,6 +9,8 @@ local maxComboPoints = 5
|
||||
local rtbEndTime = 0
|
||||
local rtbDuration = 0
|
||||
local rtbCount = 0
|
||||
local sixComboPointsTalentID = 19240
|
||||
local behaviorDependsOnComboPoints = IceHUD.WowVer < 90000
|
||||
|
||||
local CurrMaxRtBDuration = 0
|
||||
local PotentialRtBDuration = 0
|
||||
@ -19,6 +21,11 @@ for _, v in ipairs(RtBBuffs) do
|
||||
RtBSet[v] = true
|
||||
end
|
||||
|
||||
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function RollTheBones.prototype:init()
|
||||
RollTheBones.super.prototype.init(self, "RollTheBones", "player")
|
||||
@ -28,10 +35,14 @@ function RollTheBones.prototype:init()
|
||||
self.moduleSettings.shouldAnimate = false
|
||||
|
||||
self:SetDefaultColor("RollTheBones", 1, 0.6, 0.2)
|
||||
self:SetDefaultColor("RollTheBones2", 0.75, 1, 0.2)
|
||||
self:SetDefaultColor("RollTheBones3", 0.4, 1, 0.2)
|
||||
self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
|
||||
self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
|
||||
if behaviorDependsOnComboPoints then
|
||||
self:SetDefaultColor("RollTheBones2", 0.75, 1, 0.2)
|
||||
self:SetDefaultColor("RollTheBones3", 0.4, 1, 0.2)
|
||||
self:SetDefaultColor("RollTheBones4", 0.4, 1, 0.2)
|
||||
self:SetDefaultColor("RollTheBones5", 0.1, 1, 0.7)
|
||||
self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
|
||||
self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
|
||||
end
|
||||
|
||||
self.bTreatEmptyAsFull = true
|
||||
end
|
||||
@ -43,7 +54,10 @@ function RollTheBones.prototype:Enable(core)
|
||||
RollTheBones.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_AURA", "UpdateRollTheBones")
|
||||
self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
|
||||
|
||||
if behaviorDependsOnComboPoints then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
|
||||
end
|
||||
|
||||
if not self.moduleSettings.alwaysFullAlpha then
|
||||
self:Show(false)
|
||||
@ -59,7 +73,7 @@ function RollTheBones.prototype:Disable(core)
|
||||
end
|
||||
|
||||
function RollTheBones.prototype:ComboPointsChanged(...)
|
||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
||||
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||
return
|
||||
end
|
||||
|
||||
@ -99,41 +113,60 @@ function RollTheBones.prototype:GetOptions()
|
||||
opts["textSettings"].args["upperTextString"]["desc"] = "The text to display under this bar. # will be replaced with the number of Roll the Bones seconds remaining."
|
||||
opts["textSettings"].args["upperTextString"].hidden = false
|
||||
|
||||
opts["showAsPercentOfMax"] =
|
||||
{
|
||||
type = 'toggle',
|
||||
name = L["Show bar as % of maximum"],
|
||||
desc = L["If this is checked, then the RtB buff time shows as a percent of the maximum attainable (taking set bonuses and talents into account). Otherwise, the bar always goes from full to empty when applying RtB no matter the duration."],
|
||||
get = function()
|
||||
return self.moduleSettings.showAsPercentOfMax
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.showAsPercentOfMax = v
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end
|
||||
}
|
||||
if behaviorDependsOnComboPoints then
|
||||
opts["showAsPercentOfMax"] =
|
||||
{
|
||||
type = 'toggle',
|
||||
name = L["Show bar as % of maximum"],
|
||||
desc = L["If this is checked, then the RtB buff time shows as a percent of the maximum attainable (taking set bonuses and talents into account). Otherwise, the bar always goes from full to empty when applying RtB no matter the duration."],
|
||||
get = function()
|
||||
return self.moduleSettings.showAsPercentOfMax
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.showAsPercentOfMax = v
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end
|
||||
}
|
||||
|
||||
opts["durationAlpha"] =
|
||||
{
|
||||
type = "range",
|
||||
name = L["Potential RtB time bar alpha"],
|
||||
desc = L["What alpha value to use for the bar that displays how long your RtB will last if you activate it. (This gets multiplied by the bar's current alpha to stay in line with the bar on top of it)"],
|
||||
min = 0,
|
||||
max = 100,
|
||||
step = 5,
|
||||
get = function()
|
||||
return self.moduleSettings.durationAlpha * 100
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.durationAlpha = v / 100.0
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end
|
||||
}
|
||||
opts["durationAlpha"] =
|
||||
{
|
||||
type = "range",
|
||||
name = L["Potential RtB time bar alpha"],
|
||||
desc = L["What alpha value to use for the bar that displays how long your RtB will last if you activate it. (This gets multiplied by the bar's current alpha to stay in line with the bar on top of it)"],
|
||||
min = 0,
|
||||
max = 100,
|
||||
step = 5,
|
||||
get = function()
|
||||
return self.moduleSettings.durationAlpha * 100
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.durationAlpha = v / 100.0
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end
|
||||
}
|
||||
|
||||
opts["bUseMultipleBuffColors"] =
|
||||
{
|
||||
type = 'toggle',
|
||||
name = L["Use multiple buff colors"],
|
||||
desc = L["If this is checked, then the bar uses different colors depending on how many RtB buffs you have"],
|
||||
get = function()
|
||||
return self.moduleSettings.bUseMultipleBuffColors
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.bUseMultipleBuffColors = v
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
}
|
||||
end
|
||||
|
||||
opts["bShowWithNoTarget"] =
|
||||
{
|
||||
@ -152,23 +185,6 @@ function RollTheBones.prototype:GetOptions()
|
||||
end,
|
||||
}
|
||||
|
||||
opts["bUseMultipleBuffColors"] =
|
||||
{
|
||||
type = 'toggle',
|
||||
name = L["Use multiple buff colors"],
|
||||
desc = L["If this is checked, then the bar uses different colors depending on how many RtB buffs you have"],
|
||||
get = function()
|
||||
return self.moduleSettings.bUseMultipleBuffColors
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.bUseMultipleBuffColors = v
|
||||
self:Redraw()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
}
|
||||
|
||||
return opts
|
||||
end
|
||||
|
||||
@ -179,7 +195,11 @@ function RollTheBones.prototype:CreateFrame()
|
||||
end
|
||||
|
||||
function RollTheBones.prototype:CreateDurationBar()
|
||||
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK")
|
||||
if not behaviorDependsOnComboPoints then
|
||||
return
|
||||
end
|
||||
|
||||
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
|
||||
|
||||
-- Rokiyo: Do we need to call this here?
|
||||
self.CurrScale = 0
|
||||
@ -197,7 +217,9 @@ end
|
||||
function RollTheBones.prototype:RotateHorizontal()
|
||||
RollTheBones.super.prototype.RotateHorizontal(self)
|
||||
|
||||
self:RotateFrame(self.durationFrame)
|
||||
if self.durationFrame then
|
||||
self:RotateFrame(self.durationFrame)
|
||||
end
|
||||
end
|
||||
|
||||
function RollTheBones.prototype:ResetRotation()
|
||||
@ -212,8 +234,12 @@ end
|
||||
|
||||
function RollTheBones.prototype:GetBuffDuration(unitName, ids)
|
||||
local i = 1
|
||||
local buff, rank, texture, type, duration, endTime, remaining, spellId
|
||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
local buff, _, type, duration, endTime, spellId
|
||||
if IceHUD.WowVer < 80000 then
|
||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
end
|
||||
|
||||
local realDuration, remaining, count
|
||||
local now = GetTime()
|
||||
@ -230,7 +256,11 @@ function RollTheBones.prototype:GetBuffDuration(unitName, ids)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
if IceHUD.WowVer < 80000 then
|
||||
buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@ -293,7 +323,7 @@ function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
|
||||
if not remaining then
|
||||
remaining = rtbEndTime - now
|
||||
end
|
||||
local denominator = (self.moduleSettings.showAsPercentOfMax and CurrMaxRtBDuration or rtbDuration)
|
||||
local denominator = ((self.moduleSettings.showAsPercentOfMax and behaviorDependsOnComboPoints) and CurrMaxRtBDuration or rtbDuration)
|
||||
self:UpdateBar(denominator ~= 0 and remaining / denominator or 0, self:GetColorName(rtbCount))
|
||||
else
|
||||
self:UpdateBar(0, "RollTheBones")
|
||||
@ -311,13 +341,13 @@ function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
|
||||
|
||||
-- somewhat redundant, but we also need to check potential remaining time
|
||||
if (remaining ~= nil) or PotentialRtBDuration > 0 then
|
||||
local potText = " (" .. PotentialRtBDuration .. ")"
|
||||
local potText = behaviorDependsOnComboPoints and " (" .. PotentialRtBDuration .. ")" or ""
|
||||
self:SetBottomText1(self.moduleSettings.upperText .. tostring(floor(remaining or 0)) .. (self.moduleSettings.durationAlpha ~= 0 and potText or ""))
|
||||
end
|
||||
end
|
||||
|
||||
function RollTheBones.prototype:GetColorName(count)
|
||||
if self.moduleSettings.bUseMultipleBuffColors and count >= 2 then
|
||||
if behaviorDependsOnComboPoints and self.moduleSettings.bUseMultipleBuffColors and count >= 2 then
|
||||
return "RollTheBones"..count
|
||||
else
|
||||
return "RollTheBones"
|
||||
@ -337,13 +367,17 @@ function RollTheBones.prototype:TargetChanged()
|
||||
end
|
||||
|
||||
function RollTheBones.prototype:UpdateDurationBar(event, unit)
|
||||
if not self.durationFrame then
|
||||
return
|
||||
end
|
||||
|
||||
if unit and unit ~= self.unit then
|
||||
return
|
||||
end
|
||||
|
||||
local points = RTBGetComboPoints(self.unit)
|
||||
-- check for Deeper Stratagem
|
||||
local _, _, _, DeeperStratagem = GetTalentInfo(3, 1, 1)
|
||||
local _, _, _, DeeperStratagem = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
|
||||
|
||||
if DeeperStratagem then
|
||||
-- first, set the cached upper limit of RtB duration
|
||||
|
@ -4,21 +4,21 @@ local Runes = IceCore_CreateClass(IceElement)
|
||||
local IceHUD = _G.IceHUD
|
||||
|
||||
local CooldownFrame_SetTimer = CooldownFrame_SetTimer
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
if CooldownFrame_Set then
|
||||
CooldownFrame_SetTimer = CooldownFrame_Set
|
||||
end
|
||||
|
||||
-- blizzard cracks me up. the below block is copied verbatim from RuneFrame.lua ;)
|
||||
--Readability == win
|
||||
local RUNETYPE_BLOOD = 1;
|
||||
local RUNETYPE_DEATH = 2;
|
||||
local RUNETYPE_FROST = 3;
|
||||
local RUNETYPE_DEATH = IceHUD.WowVer < 70300 and 2 or 3;
|
||||
local RUNETYPE_FROST = IceHUD.WowVer < 70300 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 then
|
||||
if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 70300 then
|
||||
GetRuneType = function() return RUNETYPE_LEGION end
|
||||
elseif IceHUD.WowVer >= 70300 then
|
||||
GetRuneType = function() return GetSpecialization() end
|
||||
end
|
||||
|
||||
local RUNEMODE_DEFAULT = "Blizzard"
|
||||
@ -43,15 +43,22 @@ Runes.prototype.numRunes = 6
|
||||
|
||||
Runes.prototype.lastRuneState = {}
|
||||
|
||||
local SPELL_POWER_RUNES = SPELL_POWER_RUNES
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_RUNES = Enum.PowerType.Runes
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function Runes.prototype:init()
|
||||
Runes.super.prototype.init(self, "Runes")
|
||||
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if IceHUD.WowVer < 70000 or IceHUD.WowVer >= 70300 then
|
||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_BLOOD], 255, 0, 0)
|
||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_DEATH], 0, 207, 0)
|
||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_FROST], 0, 255, 255)
|
||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
|
||||
if IceHUD.WowVer < 70300 then
|
||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
|
||||
end
|
||||
else
|
||||
self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_LEGION], 204, 204, 255)
|
||||
end
|
||||
@ -268,9 +275,14 @@ function Runes.prototype:Enable(core)
|
||||
|
||||
Runes.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("RUNE_POWER_UPDATE", "UpdateRunePower")
|
||||
self:RegisterEvent("RUNE_TYPE_UPDATE", "UpdateRuneType")
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetRuneAvailability")
|
||||
self:RegisterEvent("RUNE_POWER_UPDATE", "ResetRuneAvailability")
|
||||
if IceHUD.WowVer < 80000 then
|
||||
self:RegisterEvent("RUNE_TYPE_UPDATE", "UpdateRuneType")
|
||||
end
|
||||
if IceHUD.WowVer >= 70300 then
|
||||
self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", "UpdateRuneColors")
|
||||
end
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
@ -278,6 +290,11 @@ function Runes.prototype:Enable(core)
|
||||
end
|
||||
end
|
||||
|
||||
function Runes.prototype:EnteringWorld()
|
||||
self:TargetChanged()
|
||||
self:ResetRuneAvailability()
|
||||
end
|
||||
|
||||
function Runes.prototype:Disable(core)
|
||||
Runes.super.prototype.Disable(self, core)
|
||||
|
||||
@ -300,16 +317,17 @@ function Runes.prototype:CheckMaxNumRunes(event, unit, powerType)
|
||||
end
|
||||
end
|
||||
|
||||
function Runes.prototype:ResetRuneAvailability()
|
||||
function Runes.prototype:ResetRuneAvailability(event)
|
||||
for i=1, self.numRunes do
|
||||
self:UpdateRunePower(nil, i, true)
|
||||
self:UpdateRunePower(event, i, not event)
|
||||
end
|
||||
|
||||
self:Redraw()
|
||||
end
|
||||
|
||||
-- simply shows/hides the foreground rune when it becomes usable/unusable. this allows the background transparent rune to show only
|
||||
function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
||||
if not rune or not self.frame.graphical or #self.frame.graphical < rune then
|
||||
if rune and (not self.frame.graphical or #self.frame.graphical < rune) then
|
||||
return
|
||||
end
|
||||
|
||||
@ -323,27 +341,9 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
||||
local lastState = self.lastRuneState[rune]
|
||||
self.lastRuneState[rune] = usable
|
||||
|
||||
if self.moduleSettings.runeMode ~= RUNEMODE_DEFAULT then
|
||||
if lastState == usable then
|
||||
return
|
||||
end
|
||||
|
||||
if usable then
|
||||
for i=1,self.numRunes do
|
||||
if self.frame.graphical[i]:GetAlpha() == 0 then
|
||||
rune = i
|
||||
break
|
||||
end
|
||||
end
|
||||
else
|
||||
for i=1,self.numRunes do
|
||||
if self.frame.graphical[i]:GetAlpha() == 0 then
|
||||
break
|
||||
end
|
||||
rune = i
|
||||
end
|
||||
end
|
||||
end
|
||||
-- if lastState == usable then
|
||||
-- return
|
||||
-- end
|
||||
|
||||
-- print("Runes.prototype:UpdateRunePower: rune="..rune.." usable="..(usable and "yes" or "no").." GetRuneType(rune)="..GetRuneType(rune));
|
||||
|
||||
@ -357,12 +357,13 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
||||
self.frame.graphical[rune]:SetAlpha(1)
|
||||
end
|
||||
|
||||
if not dontFlash then
|
||||
if not dontFlash and lastState ~= usable then
|
||||
local fadeInfo={
|
||||
mode = "IN",
|
||||
timeToFade = 0.5,
|
||||
finishedFunc = function(rune) self:ShineFinished(rune) end,
|
||||
finishedArg1 = rune
|
||||
timeToFade = 0.25,
|
||||
finishedFunc = Runes.prototype.ShineFinished,
|
||||
finishedArg1 = self,
|
||||
finishedArg2 = rune
|
||||
}
|
||||
UIFrameFade(self.frame.graphical[rune].shine, fadeInfo);
|
||||
end
|
||||
@ -380,8 +381,6 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
|
||||
self.frame.graphical[rune]:SetAlpha(0.2)
|
||||
end
|
||||
end
|
||||
|
||||
self:Redraw()
|
||||
end
|
||||
|
||||
function Runes.prototype:GetNumRunesAvailable()
|
||||
@ -418,7 +417,17 @@ function Runes.prototype:UpdateRuneType(event, rune)
|
||||
self.frame.graphical[rune].rune:SetVertexColor(self:GetColor("Runes"..thisRuneName))
|
||||
end
|
||||
|
||||
function Runes.prototype:UpdateRuneColors()
|
||||
for i=1,self.numRunes do
|
||||
self:UpdateRuneType(nil, i)
|
||||
end
|
||||
end
|
||||
|
||||
function Runes.prototype:GetRuneTexture(runeName)
|
||||
if IceHUD.WowVer >= 70300 then
|
||||
runeName = self.runeNames[RUNETYPE_LEGION]
|
||||
end
|
||||
|
||||
if self.moduleSettings.runeMode == RUNEMODE_DEFAULT and runeName then
|
||||
return "Interface\\PlayerFrame\\UI-PlayerFrame-DeathKnight-"..runeName
|
||||
elseif self.moduleSettings.runeMode == RUNEMODE_BAR then
|
||||
@ -555,13 +564,7 @@ function Runes.prototype:ShowBlizz()
|
||||
RuneFrame:Show()
|
||||
|
||||
RuneFrame:GetScript("OnLoad")(RuneFrame)
|
||||
RuneFrame:GetScript("OnEvent")(frame, "PLAYER_ENTERING_WORLD")
|
||||
for i=1, self.numRunes do
|
||||
local frame = _G["RuneButtonIndividual"..i]
|
||||
if frame then
|
||||
frame:GetScript("OnLoad")(frame)
|
||||
end
|
||||
end
|
||||
RuneFrame:GetScript("OnEvent")(RuneFrame, "PLAYER_ENTERING_WORLD")
|
||||
end
|
||||
|
||||
local function hook_playerframe()
|
||||
|
@ -3,14 +3,26 @@ local ShardCounter = IceCore_CreateClass(IceClassPowerCounter)
|
||||
|
||||
local CurrentSpec = nil
|
||||
|
||||
local AfflictionCoords =
|
||||
{
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
}
|
||||
local AfflictionCoords
|
||||
if IceHUD.WowVer < 70200 then
|
||||
AfflictionCoords =
|
||||
{
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||
}
|
||||
else
|
||||
AfflictionCoords =
|
||||
{
|
||||
{0, 1, 0, 1},
|
||||
{0, 1, 0, 1},
|
||||
{0, 1, 0, 1},
|
||||
{0, 1, 0, 1},
|
||||
{0, 1, 0, 1},
|
||||
}
|
||||
end
|
||||
|
||||
local DestructionCoords =
|
||||
{
|
||||
@ -25,6 +37,11 @@ local DemonologyCoords =
|
||||
{0.03906250, 0.55468750, 0.10546875, 0.19921875},
|
||||
}
|
||||
|
||||
local SPELL_POWER_SOUL_SHARDS = SPELL_POWER_SOUL_SHARDS
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards
|
||||
end
|
||||
|
||||
function ShardCounter.prototype:init()
|
||||
ShardCounter.super.prototype.init(self, "Warlock Power")
|
||||
|
||||
@ -36,6 +53,10 @@ function ShardCounter.prototype:init()
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
self.runeHeight = 23
|
||||
self.runeWidth = 26
|
||||
if IceHUD.WowVer >= 70200 then
|
||||
self.runeHeight = 27
|
||||
self.runeWidth = 22
|
||||
end
|
||||
self.runeCoords = AfflictionCoords
|
||||
self.unitPower = SPELL_POWER_SOUL_SHARDS
|
||||
self.unit = "player"
|
||||
@ -45,6 +66,16 @@ end
|
||||
function ShardCounter.prototype:Enable(core)
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
self.numRunes = UnitPowerMax(self.unit, self.unitPower)
|
||||
|
||||
if IceHUD.WowVer >= 80000 or GetSpecialization() == SPEC_WARLOCK_DESTRUCTION then
|
||||
self.shouldShowUnmodified = true
|
||||
self.numericFormat = "%.1f"
|
||||
self.round = floor
|
||||
else
|
||||
self.shouldShowUnmodified = nil
|
||||
self.numericFormat = nil
|
||||
self.round = nil
|
||||
end
|
||||
end
|
||||
|
||||
ShardCounter.super.prototype.Enable(self, core)
|
||||
@ -76,6 +107,7 @@ function ShardCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
||||
end
|
||||
|
||||
if event == "PLAYER_ENTERING_WORLD" and IceHUD.WowVer < 70000 then
|
||||
self:TargetChanged()
|
||||
self:UpdatePowerType(event)
|
||||
end
|
||||
|
||||
@ -90,10 +122,10 @@ function ShardCounter.prototype:CheckGreenFire()
|
||||
end
|
||||
|
||||
function ShardCounter.prototype:UpdatePowerType(event)
|
||||
if IceHUD.WowVer >= 50000 then
|
||||
if IceHUD.WowVer >= 50000 and IceHUD.WowVer < 80000 then
|
||||
CurrentSpec = GetSpecialization()
|
||||
else
|
||||
-- all warlocks use shards in pre-5.0, so just act like our spec is affliction
|
||||
-- all warlocks use shards in pre-5.0/post-8.0, so just act like our spec is affliction
|
||||
CurrentSpec = SPEC_WARLOCK_AFFLICTION
|
||||
end
|
||||
|
||||
@ -205,6 +237,10 @@ function ShardCounter.prototype:GetDefaultSettings()
|
||||
end
|
||||
|
||||
function ShardCounter.prototype:GetRuneTexture(rune)
|
||||
if IceHUD.WowVer >= 70200 then
|
||||
return nil
|
||||
end
|
||||
|
||||
if not rune or rune ~= tonumber(rune) then
|
||||
return
|
||||
end
|
||||
@ -222,6 +258,10 @@ function ShardCounter.prototype:GetRuneTexture(rune)
|
||||
return "Interface\\PlayerFrame\\UI-WarlockShard"
|
||||
end
|
||||
|
||||
function ShardCounter.prototype:GetRuneAtlas(rune)
|
||||
return "Warlock-ReadyShard"
|
||||
end
|
||||
|
||||
function ShardCounter.prototype:ShowBlizz()
|
||||
WarlockPowerFrame:Show()
|
||||
|
||||
|
@ -20,6 +20,7 @@ local impSndBonusPerRank = 0.25
|
||||
local maxComboPoints = 5
|
||||
local sndEndTime = 0
|
||||
local sndDuration = 0
|
||||
local sixComboPointsTalentID = 19240
|
||||
|
||||
local CurrMaxSnDDuration = 0
|
||||
local PotentialSnDDuration = 0
|
||||
@ -28,6 +29,16 @@ if IceHUD.WowVer >= 50000 then
|
||||
baseTime = 12
|
||||
gapPerComboPoint = 6
|
||||
end
|
||||
if IceHUD.WowClassic then
|
||||
impSndBonusPerRank = 0.15
|
||||
impSndTalentPage = 1
|
||||
impSndTalentIdx = 6
|
||||
end
|
||||
|
||||
local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
|
||||
if IceHUD.WowVer >= 80000 then
|
||||
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function SliceAndDice.prototype:init()
|
||||
@ -50,10 +61,15 @@ function SliceAndDice.prototype:Enable(core)
|
||||
SliceAndDice.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice")
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
|
||||
else
|
||||
self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
|
||||
end
|
||||
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
self:RegisterEvent("PLAYER_TALENT_UPDATE", "CheckMaxComboPoints")
|
||||
self:CheckMaxComboPoints()
|
||||
end
|
||||
|
||||
if not self.moduleSettings.alwaysFullAlpha then
|
||||
@ -65,12 +81,17 @@ function SliceAndDice.prototype:Enable(core)
|
||||
self:SetBottomText1("")
|
||||
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
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:Disable(core)
|
||||
SliceAndDice.super.prototype.Disable(self, core)
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:ComboPointsChanged(...)
|
||||
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
|
||||
if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
|
||||
return
|
||||
end
|
||||
|
||||
@ -172,7 +193,7 @@ function SliceAndDice.prototype:CreateFrame()
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:CreateDurationBar()
|
||||
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK")
|
||||
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
|
||||
|
||||
-- Rokiyo: Do we need to call this here?
|
||||
self.CurrScale = 0
|
||||
@ -205,15 +226,15 @@ end
|
||||
|
||||
function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
|
||||
local i = 1
|
||||
local buff, rank, texture, count, type, duration, endTime, remaining
|
||||
if IceHUD.WowVer >= 30000 then
|
||||
buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
|
||||
local buff, _, texture, duration, endTime, remaining
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
|
||||
buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
end
|
||||
|
||||
while buff do
|
||||
if (texture and string.match(texture, buffName)) then
|
||||
if (texture and (type(buffName) == 'string' and string.match(texture, buffName) or texture == buffName)) then
|
||||
if endTime and not remaining then
|
||||
remaining = endTime - GetTime()
|
||||
end
|
||||
@ -222,10 +243,10 @@ function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
if IceHUD.WowVer >= 30000 then
|
||||
buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
else
|
||||
buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
|
||||
buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
|
||||
end
|
||||
end
|
||||
|
||||
@ -243,7 +264,7 @@ function SliceAndDice.prototype:MyOnUpdate()
|
||||
end
|
||||
|
||||
local function SNDGetComboPoints(unit)
|
||||
if IceHUD.WowVer >= 60000 then
|
||||
if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
|
||||
return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
|
||||
elseif IceHUD.WowVer >= 30000 then
|
||||
return GetComboPoints(unit, "target")
|
||||
@ -260,6 +281,10 @@ local function HasSpell(id)
|
||||
end
|
||||
|
||||
local function ShouldHide()
|
||||
if IceHUD.WowVer >= 90000 then
|
||||
return false
|
||||
end
|
||||
|
||||
return --[[(IceHUD.WowVer < 70000 or not IsSpellKnown(193316)) and]] not IsPlayerSpell(5171) -- IsSpellKnown returns incorrect info for SnD in 7.0
|
||||
-- commented code is here in case we decide we'd like to use this module for Roll the Bones.
|
||||
-- if we do, though, the "active" check gets way more complicated since it can activate any number of 6 different abilities
|
||||
@ -275,7 +300,7 @@ function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
|
||||
local remaining = nil
|
||||
|
||||
if not fromUpdate or IceHUD.WowVer < 30000 then
|
||||
sndDuration, remaining = self:GetBuffDuration(self.unit, "Ability_Rogue_SliceDice")
|
||||
sndDuration, remaining = self:GetBuffDuration(self.unit, (IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and "Ability_Rogue_SliceDice" or 132306)
|
||||
|
||||
if not remaining then
|
||||
sndEndTime = 0
|
||||
@ -399,8 +424,10 @@ function SliceAndDice.prototype:GetMaxBuffTime(numComboPoints)
|
||||
end
|
||||
|
||||
local rank = 0
|
||||
local _
|
||||
_, _, _, _, rank = GetTalentInfo(impSndTalentPage, impSndTalentIdx)
|
||||
if GetTalentInfo then
|
||||
local _
|
||||
_, _, _, _, rank = GetTalentInfo(impSndTalentPage, impSndTalentIdx)
|
||||
end
|
||||
|
||||
maxduration = maxduration * (1 + (rank * impSndBonusPerRank))
|
||||
end
|
||||
@ -461,6 +488,9 @@ function SliceAndDice.prototype:HasNineTailedBonus()
|
||||
end
|
||||
|
||||
function SliceAndDice.prototype:HasGlyphBonus()
|
||||
if not GetNumGlyphSockets then
|
||||
return false
|
||||
end
|
||||
for i=1,GetNumGlyphSockets() do
|
||||
local enabled, _, _, spell = GetGlyphSocketInfo(i)
|
||||
|
||||
|
@ -13,6 +13,7 @@ local ModerateID = 124274
|
||||
local HeavyID = 124273
|
||||
local StaggerID = 124255
|
||||
local staggerNames = {"", "", ""}
|
||||
local staggerIds = {LightID, ModerateID, HeavyID}
|
||||
|
||||
local MinLevel = 10
|
||||
|
||||
@ -71,7 +72,7 @@ function StaggerBar.prototype:GetOptions()
|
||||
name = "Max Percent",
|
||||
desc = "Maximum percentage of your maximum health for the Stagger bar to represent. I.e, if set to 20%, the bar will be full when the Stagger damage over time effect is dealing 20% of your maximum health per second.",
|
||||
min = 0,
|
||||
max = 50,
|
||||
max = 100,
|
||||
step = 1,
|
||||
get = function()
|
||||
return self.moduleSettings.maxPercent
|
||||
@ -136,7 +137,7 @@ function StaggerBar.prototype:CreateFrame()
|
||||
end
|
||||
|
||||
function StaggerBar.prototype:CreateTimerBar()
|
||||
self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK")
|
||||
self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK", "Timer")
|
||||
|
||||
self.CurrScale = 0
|
||||
|
||||
@ -156,6 +157,7 @@ function StaggerBar.prototype:UpdateShown()
|
||||
end
|
||||
|
||||
function StaggerBar.prototype:PLAYER_ENTERING_WORLD()
|
||||
self:TargetChanged()
|
||||
self:UpdateStaggerBar()
|
||||
end
|
||||
|
||||
@ -165,7 +167,7 @@ end
|
||||
|
||||
function StaggerBar.prototype:GetDebuffInfo()
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
self.amount = UnitStagger(self.unit)
|
||||
self.amount = UnitStagger(self.unit) or 0
|
||||
self.staggerLevel = 1
|
||||
|
||||
local healthMax = UnitHealthMax(self.unit)
|
||||
@ -183,13 +185,13 @@ function StaggerBar.prototype:GetDebuffInfo()
|
||||
local staggerLevel = 1
|
||||
|
||||
for i = 1, IceCore.BuffLimit do
|
||||
local debuffID = select(11, UnitDebuff(self.unit, i))
|
||||
local debuffID = select(IceHUD.WowVer < 80000 and 11 or 10, UnitDebuff(self.unit, i))
|
||||
|
||||
if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
|
||||
local spellName = select(1, UnitDebuff(self.unit, i))
|
||||
local spellName = UnitDebuff(self.unit, i)
|
||||
|
||||
duration = select(6, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||
amount = select(15, UnitAura(self.unit, spellName, "", "HARMFUL"))
|
||||
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"))
|
||||
staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
|
||||
|
||||
break
|
||||
@ -201,9 +203,14 @@ function StaggerBar.prototype:GetDebuffInfo()
|
||||
self.staggerLevel = staggerLevel or 1
|
||||
end
|
||||
|
||||
function StaggerBar.prototype:COMBAT_LOG_EVENT_UNFILTERED(_, timestamp, event, hideCaster, sourceGUID, sourceName, sourceFlags, sourceFlags2, destGUID, destName, destFlags, destFlags2, spellID)
|
||||
if destName == playerName then
|
||||
if spellID == StaggerID or event == "SWING_DAMAGE" or event == "SPELL_AURA_APPLIED" or event == "SPELL_AURA_REMOVED" then
|
||||
function StaggerBar.prototype:COMBAT_LOG_EVENT_UNFILTERED(...)
|
||||
local eventArgs = {...}
|
||||
if (CombatLogGetCurrentEventInfo) then
|
||||
eventArgs = {CombatLogGetCurrentEventInfo()}
|
||||
end
|
||||
|
||||
if eventArgs[9] == playerName then
|
||||
if eventArgs[12] == StaggerID or eventArgs[2] == "SWING_DAMAGE" or eventArgs[2] == "SPELL_AURA_APPLIED" or eventArgs[2] == "SPELL_AURA_REMOVED" then
|
||||
self:UpdateStaggerBar()
|
||||
end
|
||||
end
|
||||
@ -216,7 +223,7 @@ function StaggerBar.prototype:UpdateStaggerBar()
|
||||
local maxHealth = UnitHealthMax(self.unit)
|
||||
local scale = IceHUD:Clamp((self.amount / maxHealth) * (100 / self.moduleSettings.maxPercent), 0, 1)
|
||||
|
||||
if self.amount > 0 and (IceHUD.WowVer >= 7000 or self.duration <= 10) then
|
||||
if self.amount > 0 and (IceHUD.WowVer >= 70000 or self.duration <= 10) then
|
||||
-- self.timerFrame.bar:SetVertexColor(self:GetColor("StaggerTime", self.moduleSettings.timerAlpha))
|
||||
self:UpdateBar(scale or 0, "Stagger"..self.staggerLevel)
|
||||
self:UpdateShown()
|
||||
@ -227,8 +234,20 @@ function StaggerBar.prototype:UpdateStaggerBar()
|
||||
end
|
||||
end
|
||||
|
||||
function StaggerBar.prototype:GetDebuffDuration(unitName, buffName)
|
||||
local name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
|
||||
function StaggerBar.prototype:GetDebuffDuration(unitName, buffId)
|
||||
local name, _, duration, endTime
|
||||
if IceHUD.WowVer < 80000 then
|
||||
name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
|
||||
else
|
||||
for i = 1, IceCore.BuffLimit do
|
||||
local id
|
||||
name, _, _, _, duration, endTime, _, _, _, id = UnitDebuff(unitName, i)
|
||||
|
||||
if id == buffId then
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if name then
|
||||
return duration, endTime - GetTime()
|
||||
@ -255,7 +274,7 @@ function StaggerBar.prototype:UpdateTimerFrame(event, unit, fromUpdate)
|
||||
|
||||
if not fromUpdate then
|
||||
for i = 1, 3 do
|
||||
self.StaggerDuration, remaining = self:GetDebuffDuration(self.unit, staggerNames[i])
|
||||
self.StaggerDuration, remaining = self:GetDebuffDuration(self.unit, staggerIds[i])
|
||||
|
||||
if remaining then
|
||||
break
|
||||
|
@ -63,12 +63,22 @@ function IceTargetAbsorb.prototype:UpdateAbsorbAmount(event, unit)
|
||||
self.highestAbsorbSinceLastZero = absorbAmount
|
||||
end
|
||||
|
||||
self.absorbPercent = self.highestAbsorbSinceLastZero ~= 0 and absorbAmount / self.highestAbsorbSinceLastZero or 0
|
||||
|
||||
if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
|
||||
self:Show(false)
|
||||
else
|
||||
self:Show(true)
|
||||
self:UpdateBar(absorbAmount / self.highestAbsorbSinceLastZero, self.ColorName)
|
||||
end
|
||||
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||
if (self.PlayerAltManaMax ~= 100) then
|
||||
self:SetBottomText1(self:GetFormattedText(self:Round(absorbAmount)), self.ColorName)
|
||||
else
|
||||
self:SetBottomText1()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function IceTargetAbsorb.prototype:Disable(core)
|
||||
|
@ -53,6 +53,8 @@ local StunCCList = {
|
||||
105593,
|
||||
-- Remorseless Winter
|
||||
115001,
|
||||
-- Between the Eyes
|
||||
199804,
|
||||
}
|
||||
|
||||
local IncapacitateCCList = {
|
||||
@ -78,6 +80,14 @@ local IncapacitateCCList = {
|
||||
28271,
|
||||
-- Polymorph: Penguin
|
||||
59634,
|
||||
-- Polymorph: Monkey
|
||||
161354,
|
||||
-- Polymorph: Polar Bear Cub
|
||||
120137,
|
||||
-- Polymorph: Porcupine
|
||||
120140,
|
||||
-- Polymorph: Direhorn
|
||||
162625,
|
||||
-- Hibernate
|
||||
2637,
|
||||
-- Freezing Trap Effect
|
||||
@ -113,6 +123,16 @@ local FearCCList = {
|
||||
5246,
|
||||
-- Hex
|
||||
51514,
|
||||
-- Hex: Compy
|
||||
210873,
|
||||
-- Hex: Wicker Mongrel
|
||||
277784,
|
||||
-- Hex: Zandalari Tendonripper
|
||||
277778,
|
||||
-- Hex: Spider
|
||||
211004,
|
||||
-- Hex: Skeletal Hatchling
|
||||
269352,
|
||||
-- Scare Beast
|
||||
1513,
|
||||
}
|
||||
@ -315,7 +335,12 @@ end
|
||||
|
||||
function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
|
||||
local i = 1
|
||||
local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
else
|
||||
debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
end
|
||||
local isMine = unitCaster == "player"
|
||||
local result = {nil, nil, nil}
|
||||
local remaining
|
||||
@ -335,7 +360,11 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
else
|
||||
debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
|
||||
end
|
||||
isMine = unitCaster == "player"
|
||||
end
|
||||
|
||||
|
@ -15,8 +15,10 @@ end
|
||||
function TargetCast.prototype:Enable(core)
|
||||
TargetCast.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "SpellCastInterruptible")
|
||||
self:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "SpellCastNotInterruptible")
|
||||
if IceHUD.WowVer >= 30200 then
|
||||
self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "SpellCastInterruptible")
|
||||
self:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "SpellCastNotInterruptible")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -63,7 +65,12 @@ function TargetCast.prototype:GetDefaultSettings()
|
||||
settings["side"] = IceCore.Side.Right
|
||||
settings["offset"] = 3
|
||||
settings["flashInstants"] = "Never"
|
||||
settings["flashFailures"] = "Never"
|
||||
-- Fulzamoth 2019-09-27 : let the flash handler work if in Classic and LibClassicCasterino exists
|
||||
if LibClassicCasterino then
|
||||
settings["flashFailures"] = ""
|
||||
else
|
||||
settings["flashFailures"] = "Never"
|
||||
end
|
||||
settings["shouldAnimate"] = false
|
||||
settings["hideAnimationSettings"] = true
|
||||
settings["usesDogTagStrings"] = false
|
||||
@ -82,18 +89,24 @@ function TargetCast.prototype:TargetChanged(unit)
|
||||
return
|
||||
end
|
||||
|
||||
local spell, _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
|
||||
if (spell) then
|
||||
self.notInterruptible = notInterruptibleCast
|
||||
self:StartBar(IceCastBar.Actions.Cast)
|
||||
return
|
||||
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))
|
||||
if spell then
|
||||
self.notInterruptible = notInterruptibleCast
|
||||
self:StartBar(IceCastBar.Actions.Cast)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local channel, _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
|
||||
if (channel) then
|
||||
self.notInterruptible = notInterruptibleChannel
|
||||
self:StartBar(IceCastBar.Actions.Channel)
|
||||
return
|
||||
if UnitChannelInfo then
|
||||
local channel = UnitChannelInfo(self.unit)
|
||||
notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 8 or 7, UnitChannelInfo(self.unit))
|
||||
if channel then
|
||||
self.notInterruptible = notInterruptibleChannel
|
||||
self:StartBar(IceCastBar.Actions.Channel)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
self:StopBar()
|
||||
@ -167,13 +180,18 @@ function TargetCast.prototype:GetOptions()
|
||||
end
|
||||
|
||||
function TargetCast.prototype:StartBar(action, message)
|
||||
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, castId, notInterruptible = UnitCastingInfo(self.unit)
|
||||
if not (spell) then
|
||||
spell, rank, displayName, icon, startTime, endTime, isTradeSkill, notInterruptible = UnitChannelInfo(self.unit)
|
||||
local spell, notInterruptible
|
||||
if UnitCastingInfo then
|
||||
spell = UnitCastingInfo(self.unit)
|
||||
notInterruptible = select(IceHUD.WowVer < 80000 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))
|
||||
|
||||
if not spell then
|
||||
return
|
||||
if not spell then
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
self.notInterruptible = notInterruptible
|
||||
@ -184,5 +202,8 @@ end
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
|
||||
-- Fulzamoth 2019-09-27 : load in Classic if LibClassicCasterino exists
|
||||
-- Load us up
|
||||
IceHUD.TargetCast = TargetCast:new()
|
||||
if not IceHUD.WowClassic or LibClassicCasterino then
|
||||
IceHUD.TargetCast = TargetCast:new()
|
||||
end
|
||||
|
@ -637,9 +637,11 @@ function IceTargetHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("UPDATE_FACTION", "CheckPvP")
|
||||
self:RegisterEvent("PLAYER_FLAGS_CHANGED", "CheckPvP")
|
||||
self:RegisterEvent("UNIT_FACTION", "CheckPvP")
|
||||
self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
|
||||
if GetLFGRoles then
|
||||
self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
|
||||
end
|
||||
end
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
@ -840,21 +842,46 @@ function IceTargetHealth.prototype:Update(unit)
|
||||
|
||||
self:UpdateBar(self.healthPercentage, self.color)
|
||||
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||
self:SetBottomText1(math.floor(self.healthPercentage * 100))
|
||||
if IsAddOnLoaded("RealMobHealth") then
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||
self:SetBottomText1(math.floor(self.healthPercentage * 100))
|
||||
|
||||
if self.moduleSettings.abbreviateHealth then
|
||||
self.health = self:Round(self.health)
|
||||
self.maxHealth = self:Round(self.maxHealth)
|
||||
end
|
||||
if self.moduleSettings.abbreviateHealth then
|
||||
if RealMobHealth.UnitHasHealthData(unit) then
|
||||
self.health, self.maxHealth = RealMobHealth.GetUnitHealth(unit)
|
||||
end
|
||||
self.health = self:Round(self.health)
|
||||
self.maxHealth = self:Round(self.maxHealth)
|
||||
end
|
||||
|
||||
if (self.maxHealth ~= 100) then
|
||||
self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
|
||||
else
|
||||
self:SetBottomText2()
|
||||
if RealMobHealth.UnitHasHealthData(unit) or (self.maxHealth ~= 100) then
|
||||
if RealMobHealth.UnitHasHealthData(unit) then
|
||||
self.health, self.maxHealth = RealMobHealth.GetUnitHealth(unit)
|
||||
self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
|
||||
else
|
||||
self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
|
||||
end
|
||||
else
|
||||
self:SetBottomText2()
|
||||
end
|
||||
end
|
||||
else
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
|
||||
self:SetBottomText1(math.floor(self.healthPercentage * 100))
|
||||
|
||||
if self.moduleSettings.abbreviateHealth then
|
||||
self.health = self:Round(self.health)
|
||||
self.maxHealth = self:Round(self.maxHealth)
|
||||
end
|
||||
|
||||
if (self.maxHealth ~= 100) then
|
||||
self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
|
||||
else
|
||||
self:SetBottomText2()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
self:CheckPvP()
|
||||
self:CheckPartyRole()
|
||||
self:SetIconAlpha()
|
||||
@ -972,17 +999,6 @@ function IceTargetHealth.prototype:UpdateRaidTargetIcon()
|
||||
end
|
||||
|
||||
|
||||
function IceTargetHealth.prototype:Round(health)
|
||||
if (health > 1000000) then
|
||||
return IceHUD:MathRound(health/1000000, 1) .. "M"
|
||||
end
|
||||
if (health > 1000) then
|
||||
return IceHUD:MathRound(health/1000, 1) .. "k"
|
||||
end
|
||||
return health
|
||||
end
|
||||
|
||||
|
||||
function IceTargetHealth.prototype:CheckPvP()
|
||||
local pvpMode = nil
|
||||
local minx, maxx, miny, maxy
|
||||
@ -1074,9 +1090,9 @@ function IceTargetHealth.prototype:CheckPartyRole()
|
||||
if self.configMode or IceHUD:GetIsInLFGGroup() then
|
||||
if self.configMode or self.moduleSettings.showPartyRoleIcon then
|
||||
local isTank, isHeal, isDPS
|
||||
local proposalExists, typeID, id, name
|
||||
local proposalExists, typeID, id, subtypeID, name
|
||||
local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
|
||||
proposalExists, typeID, id, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||
proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
|
||||
|
||||
local p = self.unit
|
||||
if IceHUD.WowVer < 40000 then
|
||||
|
@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
IceTargetInfo = IceCore_CreateClass(IceElement)
|
||||
|
||||
local CooldownFrame_SetTimer = CooldownFrame_SetTimer
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
if CooldownFrame_Set then
|
||||
CooldownFrame_SetTimer = CooldownFrame_Set
|
||||
end
|
||||
|
||||
@ -12,6 +12,10 @@ local internal = "internal"
|
||||
|
||||
local ValidAnchors = { "TOPLEFT", "TOPRIGHT", "BOTTOMLEFT", "BOTTOMRIGHT", "CENTER" }
|
||||
|
||||
---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
|
||||
local LibClassicDurations = LibStub("LibClassicDurations", 1)
|
||||
---- end change by Fulzamoth
|
||||
|
||||
IceTargetInfo.prototype.unit = "target"
|
||||
|
||||
IceTargetInfo.prototype.buffSize = nil
|
||||
@ -129,7 +133,9 @@ function IceTargetInfo.prototype:Enable(core)
|
||||
self:RegisterEvent("UNIT_LEVEL", "TargetLevel")
|
||||
|
||||
self:RegisterEvent("UNIT_FLAGS", "TargetFlags")
|
||||
self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
|
||||
end
|
||||
|
||||
self:RegisterEvent("RAID_TARGET_UPDATE", "UpdateRaidTargetIcon")
|
||||
|
||||
@ -958,6 +964,23 @@ function IceTargetInfo.prototype:GetOptions()
|
||||
order = 39.3,
|
||||
}
|
||||
|
||||
opts["showRaidIcon"] = {
|
||||
type = 'toggle',
|
||||
name = L['Show raid icon'],
|
||||
desc = L['Whether or not to show the raid icon for this unit.'],
|
||||
get = function()
|
||||
return self.moduleSettings.showRaidIcon
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.moduleSettings.showRaidIcon = v
|
||||
self:UpdateRaidTargetIcon()
|
||||
end,
|
||||
disabled = function()
|
||||
return not self.moduleSettings.enabled
|
||||
end,
|
||||
order = 37.02,
|
||||
}
|
||||
|
||||
return opts
|
||||
end
|
||||
|
||||
@ -1011,6 +1034,7 @@ function IceTargetInfo.prototype:GetDefaultSettings()
|
||||
["sortByExpiration"] = true,
|
||||
}
|
||||
}
|
||||
defaults["showRaidIcon"] = true
|
||||
|
||||
return defaults
|
||||
end
|
||||
@ -1389,7 +1413,29 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
|
||||
|
||||
if self.moduleSettings.auras[aura].show then
|
||||
for i = 1, IceCore.BuffLimit do
|
||||
local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
|
||||
local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable
|
||||
|
||||
---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
|
||||
local spellID
|
||||
---- end change by Fulzamoth
|
||||
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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)
|
||||
-- 1. in addition to other info, get the spellID for for the (de)buff
|
||||
name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, _, spellID = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
|
||||
if duration == 0 and LibClassicDurations then
|
||||
-- 2. if no duration defined for the (de)buff, look up the spell in LibClassicDurations
|
||||
local classicDuration, classicExpirationTime = LibClassicDurations:GetAuraDurationByUnit(self.unit, spellID, caster)
|
||||
-- 3. set the duration if we found one.
|
||||
if classicDuration then
|
||||
duration = classicDuration
|
||||
expirationTime = classicExpirationTime
|
||||
end
|
||||
end
|
||||
---- end change by Fulzamoth
|
||||
end
|
||||
local isFromMe = (unitCaster == "player")
|
||||
|
||||
if not icon and IceHUD.IceCore:IsInConfigMode() and UnitExists(self.unit) then
|
||||
@ -1480,7 +1526,7 @@ function IceTargetInfo.prototype:AuraChanged(event, unit)
|
||||
end
|
||||
|
||||
function IceTargetInfo.prototype:UpdateRaidTargetIcon()
|
||||
if not (UnitExists(self.unit)) then
|
||||
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then
|
||||
self.frame.raidIcon:Hide()
|
||||
return
|
||||
end
|
||||
@ -1559,7 +1605,7 @@ function IceTargetInfo.prototype:TargetName(event, unit)
|
||||
end
|
||||
|
||||
|
||||
if IceHUD.WowVer < 50000 then
|
||||
if UnitIsPartyLeader then
|
||||
self.leader = UnitIsPartyLeader(self.unit) and " |cffcccc11Leader|r" or ""
|
||||
else
|
||||
self.leader = UnitIsGroupLeader(self.unit) and " |cffcccc11Leader|r" or ""
|
||||
@ -1630,7 +1676,7 @@ end
|
||||
|
||||
function IceTargetInfo.prototype:TargetFlags(event, unit)
|
||||
if (unit == self.unit or unit == internal) then
|
||||
if IceHUD.WowVer < 70000 then
|
||||
if UnitIsTapped then
|
||||
self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
|
||||
else
|
||||
self.tapped = UnitIsTapDenied(self.unit)
|
||||
|
@ -146,7 +146,12 @@ end
|
||||
|
||||
function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
|
||||
local i = 1
|
||||
local buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
local buff, rank, texture, count, buffType, duration, endTime, unitCaster
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
else
|
||||
buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
end
|
||||
local isMine = unitCaster == "player"
|
||||
local result = {nil, nil, nil}
|
||||
local remaining
|
||||
@ -173,7 +178,11 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
|
||||
|
||||
i = i + 1;
|
||||
|
||||
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
else
|
||||
buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
|
||||
end
|
||||
isMine = unitCaster == "player"
|
||||
end
|
||||
|
||||
|
@ -4,6 +4,28 @@ IceTargetMana.prototype.registerEvents = true
|
||||
IceTargetMana.prototype.color = nil
|
||||
IceTargetMana.prototype.determineColor = true
|
||||
|
||||
local SPELL_POWER_MANA = SPELL_POWER_MANA
|
||||
local SPELL_POWER_RAGE = SPELL_POWER_RAGE
|
||||
local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
|
||||
local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
|
||||
local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
|
||||
local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
|
||||
local SPELL_POWER_FURY = SPELL_POWER_FURY
|
||||
local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
|
||||
local SPELL_POWER_PAIN = SPELL_POWER_PAIN
|
||||
local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
|
||||
if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
|
||||
SPELL_POWER_MANA = Enum.PowerType.Mana
|
||||
SPELL_POWER_RAGE = Enum.PowerType.Rage
|
||||
SPELL_POWER_FOCUS = Enum.PowerType.Focus
|
||||
SPELL_POWER_ENERGY = Enum.PowerType.Energy
|
||||
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
|
||||
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
|
||||
SPELL_POWER_FURY = Enum.PowerType.Fury
|
||||
SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
|
||||
SPELL_POWER_PAIN = Enum.PowerType.Pain
|
||||
SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
|
||||
end
|
||||
|
||||
-- Constructor --
|
||||
function IceTargetMana.prototype:init(moduleName, unit)
|
||||
@ -44,9 +66,11 @@ function IceTargetMana.prototype:Enable(core)
|
||||
IceTargetMana.super.prototype.Enable(self, core)
|
||||
|
||||
if self.registerEvents then
|
||||
if IceHUD.WowVer >= 40000 then
|
||||
self:RegisterEvent("UNIT_POWER", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
|
||||
self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
|
||||
end
|
||||
else
|
||||
self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
|
||||
self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
|
||||
@ -132,7 +156,7 @@ function IceTargetMana.prototype:Update(unit)
|
||||
|
||||
if not IceHUD.IceCore:ShouldUseDogTags() then
|
||||
self:SetBottomText1(math.floor(self.manaPercentage * 100))
|
||||
self:SetBottomText2(self:GetFormattedText(self.mana, self.maxMana), color)
|
||||
self:SetBottomText2(self:GetFormattedText(self.mana, self.maxMana), self.color)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -485,7 +485,12 @@ function TargetOfTarget.prototype:UpdateBuffs()
|
||||
|
||||
if (self.moduleSettings.showDebuffs) then
|
||||
for i = 1, IceCore.BuffLimit do
|
||||
local buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
||||
local buffName, buffRank, buffTexture, buffApplications
|
||||
if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
|
||||
buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
||||
else
|
||||
buffName, buffTexture, buffApplications = UnitDebuff(self.unit, i)
|
||||
end
|
||||
|
||||
if (buffApplications and (buffApplications > 1)) then
|
||||
debuffs = debuffs + 1
|
||||
|
@ -58,16 +58,20 @@ function TargetTargetCast.prototype:UpdateTargetTarget()
|
||||
return
|
||||
end
|
||||
|
||||
local spell = UnitCastingInfo(self.unit)
|
||||
if (spell) then
|
||||
self:StartBar(IceCastBar.Actions.Cast)
|
||||
return
|
||||
if UnitCastingInfo then
|
||||
local spell = UnitCastingInfo(self.unit)
|
||||
if spell then
|
||||
self:StartBar(IceCastBar.Actions.Cast)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local channel = UnitChannelInfo(self.unit)
|
||||
if (channel) then
|
||||
self:StartBar(IceCastBar.Actions.Channel)
|
||||
return
|
||||
if UnitChannelInfo then
|
||||
local channel = UnitChannelInfo(self.unit)
|
||||
if channel then
|
||||
self:StartBar(IceCastBar.Actions.Channel)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
self:StopBar()
|
||||
@ -144,4 +148,6 @@ end
|
||||
|
||||
|
||||
-- Load us up
|
||||
IceHUD.TargetTargetCast = TargetTargetCast:new()
|
||||
if not IceHUD.WowClassic then
|
||||
IceHUD.TargetTargetCast = TargetTargetCast:new()
|
||||
end
|
||||
|
@ -16,13 +16,20 @@ 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 then
|
||||
if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
|
||||
GetNumPartyMembers = GetNumGroupMembers
|
||||
GetNumRaidMembers = GetNumGroupMembers
|
||||
MAX_NUM_PARTY_MEMBERS = MAX_PARTY_MEMBERS
|
||||
MAX_NUM_RAID_MEMBERS = MAX_RAID_MEMBERS
|
||||
end
|
||||
|
||||
local UnitGroupRolesAssigned = UnitGroupRolesAssigned
|
||||
if not UnitGroupRolesAssigned then
|
||||
UnitGroupRolesAssigned = function()
|
||||
return "NONE"
|
||||
end
|
||||
end
|
||||
|
||||
local MAX_NUM_RAID_MEMBERS = 40
|
||||
local MAX_NUM_PARTY_MEMBERS = 5
|
||||
|
||||
@ -224,7 +231,7 @@ end
|
||||
|
||||
-- create the aggro range indicator bar
|
||||
function IceThreat.prototype:CreateAggroBar()
|
||||
self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK")
|
||||
self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK", "Aggro")
|
||||
|
||||
local r, g, b = self:GetColor("ThreatPullAggro")
|
||||
if (self.settings.backgroundToggle) then
|
||||
@ -236,7 +243,7 @@ function IceThreat.prototype:CreateAggroBar()
|
||||
end
|
||||
|
||||
function IceThreat.prototype:CreateSecondThreatBar()
|
||||
self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY")
|
||||
self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY", "SecondThreat")
|
||||
|
||||
self.secondThreatBar.bar:SetVertexColor(self:GetColor("ThreatSecondPlace", self.alpha * self.moduleSettings.secondPlaceThreatAlpha))
|
||||
|
||||
@ -468,4 +475,6 @@ function IceThreat.prototype:Show(bShouldShow)
|
||||
end
|
||||
|
||||
-- Load us up
|
||||
IceHUD.IceThreat = IceThreat:new()
|
||||
if UnitDetailedThreatSituation then
|
||||
IceHUD.IceThreat = IceThreat:new()
|
||||
end
|
||||
|
@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
||||
local Totems = IceCore_CreateClass(IceElement)
|
||||
|
||||
local CooldownFrame_SetTimer = CooldownFrame_SetTimer
|
||||
if IceHUD.WowVer >= 70000 then
|
||||
if CooldownFrame_Set then
|
||||
CooldownFrame_SetTimer = CooldownFrame_Set
|
||||
end
|
||||
|
||||
@ -215,7 +215,7 @@ function Totems.prototype:Enable(core)
|
||||
Totems.super.prototype.Enable(self, core)
|
||||
|
||||
self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotem");
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetTotemAvailability");
|
||||
self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld");
|
||||
|
||||
if self.moduleSettings.hideBlizz then
|
||||
self:HideBlizz()
|
||||
@ -230,6 +230,11 @@ function Totems.prototype:Disable(core)
|
||||
end
|
||||
end
|
||||
|
||||
function Totems.prototype:EnteringWorld()
|
||||
self:TargetChanged()
|
||||
self:ResetTotemAvailability()
|
||||
end
|
||||
|
||||
function Totems.prototype:ResetTotemAvailability()
|
||||
for i=1, self.numTotems do
|
||||
self:UpdateTotem(nil, i)
|
||||
@ -237,16 +242,17 @@ function Totems.prototype:ResetTotemAvailability()
|
||||
end
|
||||
|
||||
function Totems.prototype:UpdateTotem(event, totem, ...)
|
||||
if not totem or tonumber(totem) ~= totem or totem < 1 or totem > self.numTotems then
|
||||
if not totem or tonumber(totem) ~= totem or totem < 1 or totem > self.numTotems or not GetTotemInfo then
|
||||
return
|
||||
end
|
||||
local thisTotemName = self.totemNames[TOTEM_PRIORITIES[totem]]
|
||||
|
||||
local haveTotem, name, startTime, duration, icon = GetTotemInfo(totem);
|
||||
if duration > 0 then
|
||||
self.frame.graphical[totem].totem:SetTexture(icon)
|
||||
CooldownFrame_SetTimer(self.frame.graphical[totem].cd, startTime, duration, true)
|
||||
self.frame.graphical[totem].cd:Show()
|
||||
self.frame.graphical[totem]:Show()
|
||||
self.frame.graphical[totem].name = name
|
||||
else
|
||||
self.frame.graphical[totem].cd:Hide()
|
||||
self.frame.graphical[totem]:Hide()
|
||||
@ -293,14 +299,18 @@ function Totems.prototype:GetAlphaAdd()
|
||||
end
|
||||
|
||||
function Totems.prototype:ShowBlizz()
|
||||
TotemFrame:Show()
|
||||
TotemFrame:GetScript("OnLoad")(TotemFrame)
|
||||
if TotemFrame then
|
||||
TotemFrame:Show()
|
||||
TotemFrame:GetScript("OnLoad")(TotemFrame)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function Totems.prototype:HideBlizz()
|
||||
TotemFrame:Hide()
|
||||
TotemFrame:UnregisterAllEvents()
|
||||
if TotemFrame then
|
||||
TotemFrame:Hide()
|
||||
TotemFrame:UnregisterAllEvents()
|
||||
end
|
||||
end
|
||||
|
||||
function Totems.prototype:TargetChanged()
|
||||
@ -326,8 +336,7 @@ function Totems.prototype:CheckCombat()
|
||||
end
|
||||
|
||||
function Totems.prototype:CreateTotem(i, name)
|
||||
-- whiskey tango foxtrot?! apparently arenas can cause this? I can't test out the real cause myself, so putting in a stopgap for now
|
||||
if not name then
|
||||
if not name or not GetTotemInfo then
|
||||
return
|
||||
end
|
||||
local haveTotem, name, startTime, duration, icon = GetTotemInfo(i)
|
||||
@ -354,7 +363,14 @@ function Totems.prototype:CreateTotem(i, name)
|
||||
end
|
||||
|
||||
if not self.graphicalOnEnter then
|
||||
self.graphicalOnEnter = function(button) GameTooltip:SetOwner(button); GameTooltip:SetTotem(button.slot) end
|
||||
self.graphicalOnEnter = function(button)
|
||||
GameTooltip:SetOwner(button)
|
||||
if IceHUD.WowClassic then
|
||||
GameTooltip:SetText(button.name)
|
||||
else
|
||||
GameTooltip:SetTotem(button.slot)
|
||||
end
|
||||
end
|
||||
end
|
||||
if not self.graphicalOnLeave then
|
||||
self.graphicalOnLeave = function() GameTooltip:Hide() end
|
||||
@ -396,6 +412,7 @@ function Totems.prototype:CreateTotem(i, name)
|
||||
self.frame.graphical[i]:SetScript("OnLeave", nil)
|
||||
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
|
||||
@ -405,6 +422,6 @@ end
|
||||
|
||||
-- Load us up
|
||||
local _, unitClass = UnitClass("player")
|
||||
if (unitClass == "SHAMAN") or (unitClass == "DRUID") then
|
||||
if IceHUD.WowVer >= 90000 or (unitClass == "SHAMAN") or (unitClass == "DRUID") then
|
||||
IceHUD.Totems = Totems:new()
|
||||
end
|
||||
|
22
readme.md
22
readme.md
@ -1,11 +1,13 @@
|
||||
# IceHUD
|
||||
|
||||
IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD, MetaHUD, and others designed to keep your focus in the center of the screen where your character is.
|
||||
|
||||
## **What it is**
|
||||
|
||||
### **What it is**
|
||||
* Player and target health and mana bars, casting and mirror bars, pet health and mana bars, druid mana bar in forms, extensive target info, ToT display, and much more
|
||||
* Player and target health and mana bars, casting and mirror bars, pet health and mana bars, druid mana bar in forms, extensive target info, ToT display, and much more, in a vertically-oriented heads-up display.
|
||||
|
||||
## **Short feature list**
|
||||
|
||||
### **Short feature list**
|
||||
* Lots of different bar shapes and patterns to make the HUD look like you want
|
||||
* Class-specific modules such as combo point counters, Slice'n'dice timers, druid mana trackers, Eclipse bar, Holy Power monitoring, Warlock shard tracking, and more
|
||||
* Target-of-target bars, Crowd Control timers, Range Finders, Threat meters, and plenty of other helpful modules
|
||||
@ -15,13 +17,12 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
|
||||
* Fully customizable bars and counters capable of tracking buff/debuff applications on any unit, spell/ability cooldowns, and the health/mana of any unit you specify. The custom health/mana bars will even work with crazy unit specifications like "focustargettargetfocustarget" if you want!
|
||||
* Highly configurable (can totally re-arrange all bars, change text display, etc.)
|
||||
|
||||
## **Slash commands**
|
||||
|
||||
### **Slash commands**
|
||||
* /icehud - opens the configuration UI to tweak any setting
|
||||
* /icehudCL - command-line access to tweak IceHUD settings (for use with macros, etc.)
|
||||
|
||||
|
||||
# **Frequently Asked Questions**
|
||||
## **Frequently Asked Questions**
|
||||
|
||||
1. **How do I hide the default Blizzard player, target unit frames and party unit frames?**
|
||||
Type /icehud, expand the "Module Settings" section, click "Player Health" or "Target Health," and check "Hide Blizzard Frame" and/or "Hide Blizzard Party Frame". (NOTE: before version 1.3.7, the player/target unitframes were hidden by default. Follow the same steps to enable them if desired)
|
||||
@ -63,7 +64,7 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
|
||||
Type /icehud, expand Module Settings, expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
|
||||
|
||||
1. **Which module displays Monk Chi power?**
|
||||
This module is called HarmonyPower. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. I feel like it's too late to change now that many people are familiar with the Harmony name.
|
||||
Prior to v1.11.2, this module was called HarmonyPower. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. IceHUD v1.11.2 changed this module to be called Chi.
|
||||
|
||||
1. **How do I add commas/periods into big numbers like health?**
|
||||
If you have DogTags enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
|
||||
@ -77,5 +78,10 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
|
||||
1. **How do I get rid of the bars that showed up beneath the player in the 7.0 patch?**
|
||||
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.
|
||||
|
||||
1. **Why is there no target castbar for Classic?**
|
||||
The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. IceHUD doesn't support the type of inaccurate guessing at combat log details that would be required to get a semi-useful target castbar.
|
||||
|
||||
See [here](http://www.wowace.com/addons/ice-hud/tickets/113-basic-guide-to-texture-creation/) for a user-created guide to creating new IceHUD textures.
|
||||
1. **Why do buff/debuff timers not work in Classic?**
|
||||
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 completely accurate.
|
||||
|
||||
See [here](https://www.wowace.com/projects/ice-hud/issues/113) for a user-created guide to creating new IceHUD textures.
|
||||
|
6
this_version.md
Normal file
6
this_version.md
Normal file
@ -0,0 +1,6 @@
|
||||
# Changelog
|
||||
|
||||
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)
|
||||
- Package newer LibDogTag to fix upgrade bug in that library.
|
Reference in New Issue
Block a user