Compare commits

...

31 Commits

Author SHA1 Message Date
1f9a1a3100 Update TOC for Classic-era 2023-08-23 14:38:11 -05:00
40a25a3315 Apply Strata adjustment in a few more places 2023-08-02 17:38:47 -05:00
6cee8c738c Apply strata adjustment inside BarFactory instead of every callsite 2023-08-02 08:25:34 -05:00
40fc8187fd Add ability to adjust strata globally
Submitted by slowkerd from Curseforge (thanks!)
2023-08-02 08:16:12 -05:00
b32f090644 using table.remove to not leave a hole in the array (#36) 2023-07-23 23:57:22 -05:00
d9cfb3a09c Fix 10.1.5 error building a player menu 2023-07-16 22:14:23 -10:00
8bc7b1ee90 Update TOCs 2023-07-11 16:52:17 -05:00
9cd800ee86 Update changelog 2023-07-05 13:33:12 -05:00
ca6008780f Bump TOC for Wrath-Classic 3.4.2 2023-07-04 10:18:52 -05:00
9a727e4893 Fix Vigor with new mount type(s)
I explicitly added what I believe to be the spell id for the new Grotto Netherwing Drake so it *should* work regardless, but then also discovered that the flying mount's UnitPowerMax is 0 unless you're on a Dragonriding mount, so that should be the longer-term fix for whenever old-world mounts add Dragonriding capability (10.1.5?).
2023-07-04 10:01:31 -05:00
4d71dcc660 Possible fix to reported issue
I can't reproduce the problem, but this should cover it if it happens.

https://www.wowace.com/projects/ice-hud/issues/344
2023-06-05 17:39:36 -05:00
343ac7b70b Fix aura icons not always showing on custom bars 2023-05-18 10:17:13 -05:00
573049f77e Fix Custom Bar showing empty bar in Missing mode 2023-05-18 10:15:38 -05:00
8dc173ae81 Fix custom bar showing when disabled and set to Missing
Fixes wowace ticket #343
2023-05-18 10:12:17 -05:00
5e04ace0f4 Fix CC modules on Wrath Classic 2023-05-18 09:41:44 -05:00
37108d3487 Increase max scale to 400% by request 2023-05-12 22:17:27 -05:00
8cd7c4b044 Add 10.1 dragonriding mount 2023-05-06 13:15:39 -05:00
bfffdd82d7 Fix vigor on entering world
Forgot to send the event argument, so it was returning early.

Fixes #34
2023-05-03 18:23:52 -05:00
24c45f320f Update TOC, add icon, fix Vigor for 10.1 2023-05-03 18:22:36 -05:00
1db8545b63 Update other changelog 2023-04-02 21:47:03 -05:00
18fa31807c Hide Debuff frame along with Buffs if desired 2023-04-01 20:58:25 -05:00
594ea0a3e3 Fix errors when toggling off Hide Blizz 2023-04-01 20:53:53 -05:00
cb83a3f63f Add option to hide during Cataloging 2023-04-01 20:45:37 -05:00
077286fd5f Show Runic Power on a 0-100ish scale with DogTags off 2023-04-01 20:17:50 -05:00
a50a313314 Update TOCs 2023-04-01 15:02:35 -05:00
271bb38a69 Add more Polymorph ranks 2023-02-06 20:15:52 -06:00
0e11a40d3a Don't hide Blizzard Totems by default on 10.0 2023-02-06 00:19:08 -06:00
5020279748 Fix errors when playing Faire games 2023-02-06 00:16:15 -06:00
cfaa09a541 Expose Totems Hide Blizzard setting 2023-02-01 16:41:31 -06:00
a0ed3ae6e6 Update TOCs 2023-01-25 13:40:36 -06:00
7709cb9130 Fix AltPower bar showing when it shouldn't 2023-01-22 15:56:41 -06:00
32 changed files with 377 additions and 79 deletions

View File

@ -996,7 +996,7 @@ function IceBarElement.prototype:CreateBackground()
self.frame = CreateFrame("Frame", "IceHUD_"..self.elementName, self.masterFrame)
end
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
self.frame:SetHeight(self.settings.barHeight)
@ -1041,6 +1041,7 @@ end
-- Creates the actual bar
function IceBarElement.prototype:CreateBar()
self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
self:SetBarCoord(self.barFrame)
self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
@ -1055,7 +1056,7 @@ function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer,
barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
end
barFrame:SetFrameStrata(frameStrata and frameStrata or "LOW")
barFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata(frameStrata and frameStrata or "LOW"))
barFrame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
barFrame:SetHeight(self.settings.barHeight)
self:SetBarFramePoints(barFrame)

View File

@ -386,19 +386,24 @@ function IceCastBar.prototype:MyOnUpdate()
self.action == IceCastBar.Actions.Success or
self.action == IceCastBar.Actions.Failure)
then
local scale = GetTime() - self.actionStartTime
local scale
if self.actionStartTime then
scale = GetTime() - self.actionStartTime
end
if (scale > 1) then
if scale and (scale > 1) then
self:StopBar()
return
end
self:UpdateBar(1, self:GetCurrentCastingColor())
if (self.action == IceCastBar.Actions.Failure) then
self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
else
self:FlashBar("CastSuccess", 1-scale, self.actionMessage)
if scale then
if (self.action == IceCastBar.Actions.Failure) then
self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
else
self:FlashBar("CastSuccess", 1-scale, self.actionMessage)
end
end
return
end
@ -465,7 +470,9 @@ function IceCastBar.prototype:GetCurrentCastingColor()
end
function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
self.frame:SetAlpha(alpha)
if alpha then
self.frame:SetAlpha(alpha)
end
local r, g, b = self.settings.backgroundColor.r, self.settings.backgroundColor.g, self.settings.backgroundColor.b
if (self.settings.backgroundToggle) then

View File

@ -115,6 +115,9 @@ function IceCore.prototype:SetupDefaults()
bHideDuringPetBattles = true,
bHideInBarberShop = true,
bHideDuringShellGame = true,
bHideDuringCataloging = true,
addedStrata = 0,
},
global = {
lastRunVersion = 0,
@ -284,6 +287,7 @@ function IceCore.prototype:Enable(userToggle)
self.IceHUDFrame:RegisterEvent("ZONE_CHANGED")
end
self.IceHUDFrame:RegisterEvent("UNIT_AURA")
self.IceHUDFrame:RegisterEvent("UNIT_ENTERED_VEHICLE")
self.IceHUDFrame:RegisterEvent("PLAYER_REGEN_ENABLED", IceHUD.PLAYER_REGEN_ENABLED)
self.IceHUDFrame:RegisterEvent("PLAYER_REGEN_DISABLED", IceHUD.PLAYER_REGEN_DISABLED)
self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
@ -303,6 +307,11 @@ function IceCore.prototype:Enable(userToggle)
if IceHUD.IceCore.settings.bHideInBarberShop then
self:Show()
end
elseif event == "UNIT_ENTERED_VEHICLE" then
if IceHUD.IceCore.settings.bHideDuringCataloging and IceHUD:HasAnyBuff("player", IceHUD.CatalogingSpellIDs) then
self:RegisterEvent("UNIT_EXITED_VEHICLE")
self:Hide()
end
elseif (event == "UNIT_AURA") then
local unit = ...
if unit ~= "player" then
@ -312,6 +321,9 @@ function IceCore.prototype:Enable(userToggle)
if IceHUD.IceCore.settings.bHideDuringShellGame and IceHUD:HasAnyDebuff("player", {IceHUD.ShellGameSpellID}) and UnitInVehicle("player") then
self:RegisterEvent("UNIT_EXITED_VEHICLE")
self:Hide()
elseif IceHUD.IceCore.settings.bHideDuringCataloging and IceHUD:HasAnyBuff("player", IceHUD.CatalogingSpellIDs) and UnitInVehicle("player") then
self:RegisterEvent("UNIT_EXITED_VEHICLE")
self:Hide()
elseif C_Map then
local bestMapID = C_Map.GetBestMapForUnit("player")
if bestMapID ~= ZM_MAP_ID then
@ -600,7 +612,7 @@ function IceCore.prototype:IsEnabled()
end
function IceCore.prototype:DrawFrame()
self.IceHUDFrame:SetFrameStrata("BACKGROUND")
self.IceHUDFrame:SetFrameStrata(self:DetermineStrata("BACKGROUND"))
self.IceHUDFrame:SetWidth(self.settings.gap)
self.IceHUDFrame:SetHeight(20)
@ -921,6 +933,48 @@ function IceCore.prototype:SetColor(color, r, g, b)
self:Redraw()
end
function IceCore.prototype:GetAddedStrata()
return self.settings.addedStrata
end
function IceCore.prototype:SetAddedStrata(value)
self.settings.addedStrata = value
end
-- Preventing ugly if-else blocks in module creations
-- (but could probably itself be smarter/prettier)
-- Frisbees/AddonWhiner
function IceCore.prototype:DetermineStrata(baseStrata)
if self.settings.addedStrata == 0 then
return baseStrata
end
if self.settings.addedStrata == 1 then
if baseStrata == "BACKGROUND" then
return "LOW"
elseif baseStrata == "LOW" then
return "MEDIUM"
elseif baseStrata == "MEDIUM" then
return "HIGH"
elseif baseStrata == "HIGH" then
return "DIALOG"
end
end
if self.settings.addedStrata == 2 then
if baseStrata == "BACKGROUND" then
return "MEDIUM"
elseif baseStrata == "LOW" then
return "HIGH"
elseif baseStrata == "MEDIUM" then
return "DIALOG"
elseif baseStrata == "HIGH" then
return "FULLSCREEN"
end
end
return baseStrata -- failsafe
end
function IceCore.prototype:IsInConfigMode()
return self.bConfigMode

View File

@ -74,7 +74,7 @@ function IceElement.prototype:Create(parent)
self.parent = parent
if not self.masterFrame then
self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
self.masterFrame:SetFrameStrata("MEDIUM")
self.masterFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
end
self:CreateFrame()
self:Show(false)

View File

@ -60,6 +60,8 @@ IceHUD.SupportsHealPrediction = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
IceHUD.UnitGroupRolesReturnsRoleString = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
IceHUD.ShellGameSpellID = 271571
IceHUD.HasShellGame = GetSpellInfo(IceHUD.ShellGameSpellID)
IceHUD.CatalogingSpellIDs = {366290, 372817, 385025, 385635, 386070, 386504, 400043, 403115}
IceHUD.HasCataloging = GetSpellInfo(366290)
IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
@ -884,11 +886,13 @@ local function munge_unit_menu(menu)
if btns[i].IsMenu() then
local subbtns = btns[i].GetMenuButtons()
for j=1, #subbtns do
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
if not blacklisted then
new_buttons_list[#new_buttons_list+1] = subbtns[j]
elseif blacklisted ~= true then
new_buttons_list[#new_buttons_list+1] = blacklisted
if subbtns[j] then
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
if not blacklisted then
new_buttons_list[#new_buttons_list+1] = subbtns[j]
elseif blacklisted ~= true then
new_buttons_list[#new_buttons_list+1] = blacklisted
end
end
end
else

View File

@ -1,8 +1,8 @@
## Interface: 100002
## Interface-Retail: 100002
## Interface-Classic: 11403
## Interface: 100105
## Interface-Retail: 100105
## Interface-Classic: 11404
## Interface-BCC: 20504
## Interface-Wrath: 30400
## Interface-Wrath: 30402
## Author: Parnic, originally created by Iceroth
## Name: IceHUD
## Title: IceHUD |cff7fff7f-Ace3-|r
@ -14,6 +14,7 @@
# ## Version: @project-version@
#@end-non-debug@
## SavedVariables: IceCoreDB
## IconTexture: Interface\Icons\Spell_Frost_Frost
## 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-Category: HUDs
## X-Website: https://www.wowace.com/projects/ice-hud

View File

@ -1,8 +1,8 @@
## Interface: 100002
## Interface-Retail: 100002
## Interface-Classic: 11403
## Interface: 100105
## Interface-Retail: 100105
## Interface-Classic: 11404
## Interface-BCC: 20504
## Interface-Wrath: 30400
## Interface-Wrath: 30402
## Title: IceHUD |cff7fff7f-Options-|r
## Author: Parnic
## Version: @project-version@
@ -10,6 +10,7 @@
## OptionalDeps: AceGUI-3.0-SharedMediaWidgets
## Dependencies: IceHUD
## LoadOnDemand: 1
## IconTexture: Interface\Icons\Spell_Frost_Frost
Json.lua
JsonDecode.lua

View File

@ -161,7 +161,7 @@ The Classic game client doesn't provide this information to addons because it wa
IceHUD.IceCore:SetScale(v)
end,
min = 0.2,
max = 2.0,
max = 4.0,
step = 0.05,
isPercent = true,
order = 14,
@ -426,6 +426,40 @@ The Classic game client doesn't provide this information to addons because it wa
hidden = not IceHUD.HasShellGame,
order = 36,
},
bHideDuringCataloging = {
type = 'toggle',
name = L["Hide during cataloging"],
desc = L["This will hide the entire mod when using the Dragonflight Cataloging camera."],
width = 'double',
get = function()
return IceHUD.IceCore.settings.bHideDuringCataloging
end,
set = function(info, value)
IceHUD.IceCore.settings.bHideDuringCataloging = value
if not value then
IceHUD.IceCore.IceHUDFrame:Show()
end
end,
hidden = not IceHUD.HasCataloging,
order = 36,
},
bIncreaseStrata = {
type = 'range',
name = L["Added strata"],
desc = L["Push IceHUD modules to the foreground. Increase if other addons are covering IceHUD. Requires reload."],
get = function()
return IceHUD.IceCore:GetAddedStrata()
end,
set = function(info, v)
IceHUD.IceCore:SetAddedStrata(v)
end,
min = 0,
max = 2,
step = 1,
order = 37,
},
}
},

View File

@ -19,10 +19,11 @@ IceUnitBar.prototype.hasPet = nil
IceUnitBar.prototype.noFlash = nil
local SPELL_POWER_INSANITY, SPELL_POWER_RAGE = SPELL_POWER_INSANITY, SPELL_POWER_RAGE
local SPELL_POWER_INSANITY, SPELL_POWER_RAGE, SPELL_POWER_RUNIC_POWER = SPELL_POWER_INSANITY, SPELL_POWER_RAGE, SPELL_POWER_RUNIC_POWER
if Enum and Enum.PowerType then
SPELL_POWER_INSANITY = Enum.PowerType.Insanity
SPELL_POWER_RAGE = Enum.PowerType.Rage
SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
end
-- Constructor --
@ -178,7 +179,7 @@ function IceUnitBar.prototype:CreateFlashFrame()
self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
end
self.flashFrame:SetFrameStrata("BACKGROUND")
self.flashFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.flashFrame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
self.flashFrame:SetHeight(self.settings.barHeight)
@ -239,7 +240,9 @@ function IceUnitBar.prototype:Update()
-- so this technically doesn't get us the answer we want most of the time. too risky to change at this point, though.
self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
if UnitPowerType(self.unit) == SPELL_POWER_RAGE and self.maxMana == 1000 then
local powerType = UnitPowerType(self.unit)
if (powerType == SPELL_POWER_RAGE and self.maxMana == 1000)
or (powerType == SPELL_POWER_RUNIC_POWER and self.maxMana >= 1000) then
self.mana = IceHUD:MathRound(self.mana / 10)
self.maxMana = IceHUD:MathRound(self.maxMana / 10)
end

View File

@ -1,5 +1,72 @@
# Changelog
v1.14.26:
- Update TOC for classic-era to 1.14.4
v1.14.25:
- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
- Added ability to adjust strata globally.
v1.14.24:
- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.
v1.14.23:
- Update Dragonflight TOC for 10.1.5
v1.14.22:
- Fixed reported issue with a Lua error on Wrath Classic clients. https://www.wowace.com/projects/ice-hud/issues/344
- Fixed Vigor module not working when riding Grotto Netherwing Drake (and theoretically all future Dragonriding mount types).
- Updated TOC for Wrath-Classic.
v1.14.21:
- Increased maximum scale/zoom to 400%, by request.
- Fixed TargetCC/FocusCC modules on Wrath Classic.
- Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
- Fixed Buff/Debuff Watchers showing an empty bar when set to Missing mode. If the background was disabled, this looked like just a floating spell icon.
- Fixed spell icons sometimes not showing up for custom bars until the tracked spell had been cast once.
v1.14.20:
- Added Winding Slitherdrake as recognized for the Dragonriding Vigor module
v1.14.19:
- Updated TOCs for 10.1.0
- Added addon icon for 10.1.0 clients
- Fixed Dragonriding Vigor charges not showing up in 10.1.0
- Fixed Vigor not always updating correctly when loading into the game or a new zone
v1.14.18:
- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
- Added option (enabled by default) to hide mod during cataloging.
- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
v1.14.17:
- Updated TOCs for 10.0.7
v1.14.16:
- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
- Fixed a reported error when playing Darkmoon Faire games.
- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
v1.14.15:
- Updated TOCs for 10.0.5
v1.14.14:
- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
v1.14.13:
- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)

View File

@ -616,7 +616,10 @@ function IceClassPowerCounter.prototype:SetRuneCoords(rune, percent)
local left, right, top, bottom = 0, 1, 0, 1
if self:GetRuneMode() == "Graphical" then
left, right, top, bottom = unpack(self.runeCoords[rune])
local coords = self.runeCoords[rune]
if coords then
left, right, top, bottom = unpack(coords)
end
end
if self.currentGrowMode == self.growModes["height"] then
@ -728,7 +731,7 @@ end
function IceClassPowerCounter.prototype:CreateFrame()
IceClassPowerCounter.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("LOW")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame:SetHeight(self.runeHeight)
self.frame:ClearAllPoints()
self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
@ -804,7 +807,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
-- create runes
if (not self.frame.graphical[i]) then
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "BORDER")
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
@ -874,7 +877,10 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
local a,b,c,d = 0, 1, 0, 1
if self:GetRuneMode() == "Graphical" then
width = self.runeWidth
a,b,c,d = unpack(self.runeCoords[rune])
local coords = self.runeCoords[rune]
if coords then
a,b,c,d = unpack(coords)
end
end
-- make sure any texture aside from the special one is square and has the proper coordinates

View File

@ -337,7 +337,7 @@ end
function ComboPoints.prototype:CreateFrame()
ComboPoints.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.graphicalLayout == "Horizontal" then
self.frame:SetWidth((self.comboSize - 5)*self:GetMaxComboPoints())
self.frame:SetHeight(1)
@ -396,7 +396,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphicalBG[i]:SetWidth(self.comboSize)
self.frame.graphicalBG[i]:SetHeight(self.comboSize)
if self.moduleSettings.graphicalLayout == "Horizontal" then
@ -432,7 +432,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphical[i]:SetFrameStrata("LOW")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
local r, g, b = self:GetColor("ComboPoints")
@ -471,7 +471,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphicalAnt[i]:SetFrameStrata("LOW")
self.frame.graphicalAnt[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame.graphicalAnt[i]:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel() + 1)
self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))

View File

@ -83,6 +83,7 @@ function IceCustomBar.prototype:Enable(core)
self:FixupTextColors()
self:SetCustomTextColor(self.frame.bottomUpperText, self.moduleSettings.upperTextColor)
self:SetCustomTextColor(self.frame.bottomLowerText, self.moduleSettings.lowerTextColor)
self:UpdateAuraIcon()
end
function IceCustomBar.prototype:Disable(core)
@ -204,6 +205,7 @@ end
function IceCustomBar.prototype:Redraw()
IceCustomBar.super.prototype.Redraw(self)
self:UpdateAuraIcon()
self:UpdateCustomBar(self.unit)
end
@ -822,7 +824,11 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
self:UpdateBar(self.auraDuration ~= 0 and remaining / self.auraDuration or 0, "undef")
else
self:UpdateBar(0, "undef")
local updateVal = 0
if self.moduleSettings.displayMode == displayModes.MISSING then
updateVal = 1
end
self:UpdateBar(updateVal, "undef")
self:Show(false)
if not self:ShouldAlwaysSubscribe() then
self.handlesOwnUpdates = false
@ -883,9 +889,14 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
end
if self.moduleSettings.displayMode == displayModes.MISSING then
IceCustomBar.super.prototype.Show(self, not bShouldShow)
local show = not bShouldShow
if show and not self:IsEnabled() then
show = false
end
IceCustomBar.super.prototype.Show(self, show)
elseif self.moduleSettings.displayMode == displayModes.WHEN_TARGETING and self.target then
IceCustomBar.super.prototype.Show(self, true)
IceCustomBar.super.prototype.Show(self, self:IsEnabled())
elseif self.moduleSettings.displayMode == displayModes.ALWAYS then
if not self.bIsVisible then
IceCustomBar.super.prototype.Show(self, true)
@ -894,3 +905,13 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
IceCustomBar.super.prototype.Show(self, bShouldShow)
end
end
function IceCustomBar.prototype:UpdateAuraIcon()
if not self.barFrame or not self.barFrame.icon then
return
end
local _, _, auraIcon = GetSpellInfo(self.moduleSettings.buffToTrack)
self.barFrame.icon:SetTexture(auraIcon)
end

View File

@ -326,7 +326,7 @@ end
function IceCustomCount.prototype:CreateFrame()
IceCustomCount.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.graphicalLayout == "Horizontal" then
self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
self.frame:SetHeight(1)
@ -382,7 +382,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
end
end
self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphicalBG[i]:SetWidth(self.countSize)
self.frame.graphicalBG[i]:SetHeight(self.countSize)
if self.moduleSettings.graphicalLayout == "Horizontal" then
@ -416,7 +416,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
end
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
self.frame.graphical[i]:Hide()

View File

@ -6,10 +6,15 @@ local DragonridingBuffs = {
368896, -- Renewed Proto-Drake
368899, -- Windborn Velocidrake
368901, -- Cliffside Wylderdrake
368893, -- Winding Slitherdrake
412088, -- Grotto Netherwing Drake
}
local vigorWidgetSetID = 283
local vigorWidgetID = 4460
local knowsAlternateMountEnum = Enum and Enum.PowerType and Enum.PowerType.AlternateMount
local unitPowerType = Enum and Enum.PowerType and Enum.PowerType.AlternateMount
unitPowerType = unitPowerType or ALTERNATE_POWER_INDEX
function DragonridingVigor.prototype:init()
DragonridingVigor.super.prototype.init(self, "Vigor")
@ -18,7 +23,7 @@ function DragonridingVigor.prototype:init()
self.unit = "player"
self.numericColor = "VigorNumeric"
self.unitPower = ALTERNATE_POWER_INDEX
self.unitPower = unitPowerType
self.minLevel = 0
self.bTreatEmptyAsFull = false
self.runeWidth = self.runeHeight
@ -26,7 +31,7 @@ function DragonridingVigor.prototype:init()
end
function DragonridingVigor.prototype:Enable(core)
self.numRunes = UnitPowerMax(self.unit, ALTERNATE_POWER_INDEX)
self.numRunes = UnitPowerMax(self.unit, unitPowerType)
self.runeCoords = { }
for i = 1, self.numRunes do
self:SetupNewRune(i)
@ -41,7 +46,7 @@ end
function DragonridingVigor.prototype:EnteringWorld()
DragonridingVigor.super.prototype.EnteringWorld(self)
self:CheckShouldShow("player")
self:CheckShouldShow("PLAYER_ENTERING_WORLD", "player")
end
function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
@ -49,7 +54,9 @@ function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
return
end
if IceHUD:HasAnyBuff("player", DragonridingBuffs) then
if knowsAlternateMountEnum and UnitPowerMax(self.unit, unitPowerType) > 0 then
self:Show(true)
elseif IceHUD:HasAnyBuff("player", DragonridingBuffs) then
self:Show(true)
else
self:Show(false)
@ -151,6 +158,6 @@ function DragonridingVigor.prototype:HideBlizz()
end
-- Load us up
if ALTERNATE_POWER_INDEX and C_UIWidgetManager and C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo then
if unitPowerType and C_UIWidgetManager and C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo then
IceHUD.DragonridingVigor = DragonridingVigor:new()
end

View File

@ -107,7 +107,7 @@ function EclipseBar.prototype:CreateFrame()
end
function EclipseBar.prototype:CreateSolarBar()
self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK", "Solar")
self.solarBar = self:BarFactory(self.solarBar, "BACKGROUND", "ARTWORK", "Solar")
self:SetBarCoord(self.solarBar, 0.5, true)
self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))

View File

@ -422,9 +422,9 @@ end
function FocusHealth.prototype:UpdateRaidFocusIcon()
if self.moduleSettings.raidIconOnTop then
self.frame.raidIcon:SetFrameStrata("MEDIUM")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
else
self.frame.raidIcon:SetFrameStrata("LOW")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
end
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then

View File

@ -38,7 +38,7 @@ function GlobalCoolDown.prototype:Enable(core)
self:Show(false)
self.frame:SetFrameStrata("LOW")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.CDSpellId = self:GetSpellId()
end

View File

@ -35,11 +35,12 @@ function PlayerAlternatePower.prototype:Enable(core)
self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
self:RegisterEvent("UNIT_POWER_BAR_HIDE", "PowerBarHide")
self.wantToShow = true
self:Update(self.unit)
if self.maxPower == 0 then
self:Show(false)
else
self.wantToShow = true
end
if self.moduleSettings.hideBlizz then
self:HideBlizz()

View File

@ -115,16 +115,30 @@ end
function PlayerInfo.prototype:ShowBlizz()
BuffFrame:Show()
if DebuffFrame then
DebuffFrame:Show()
DebuffFrame:GetScript("OnLoad")(DebuffFrame)
if DebuffFrame.Update then
DebuffFrame:Update()
end
end
if TemporaryEnchantFrame then
TemporaryEnchantFrame:Show()
end
BuffFrame:GetScript("OnLoad")(BuffFrame)
if BuffFrame.Update then
BuffFrame:Update()
end
end
function PlayerInfo.prototype:HideBlizz()
BuffFrame:Hide()
if DebuffFrame then
DebuffFrame:Hide()
DebuffFrame:UnregisterAllEvents()
end
if TemporaryEnchantFrame then
TemporaryEnchantFrame:Hide()
end

View File

@ -475,7 +475,7 @@ function PlayerMana.prototype:CreateTickerFrame()
self.tickerFrame = CreateFrame("Frame", nil, self.barFrame)
end
self.tickerFrame:SetFrameStrata("BACKGROUND")
self.tickerFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.tickerFrame:SetWidth(self.settings.barWidth)
self.tickerFrame:SetHeight(self.settings.barHeight)

View File

@ -126,7 +126,7 @@ function RangeCheck.prototype:CreateFrame(redraw)
end
self.frame:SetScale(self.moduleSettings.scale)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(200)
self.frame:SetHeight(32)
self.frame:ClearAllPoints()

View File

@ -456,7 +456,7 @@ end
function Runes.prototype:CreateFrame()
Runes.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.runeSize*self.numRunes)
self.frame:SetHeight(1)
self.frame:ClearAllPoints()
@ -516,7 +516,7 @@ function Runes.prototype:CreateRune(i, type, name)
self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetWidth(self.runeSize)
self.frame.graphical[i]:SetHeight(self.runeSize)
@ -546,7 +546,7 @@ function Runes.prototype:CreateRune(i, type, name)
self.frame.graphical[i]:Hide()
end
self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
self.frame.graphical[i].cd:ClearAllPoints()
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

View File

@ -214,7 +214,7 @@ function SliceAndDice.prototype:CreateFrame()
end
function SliceAndDice.prototype:CreateDurationBar()
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND", "ARTWORK", "Duration")
-- Rokiyo: Do we need to call this here?
self.CurrScale = 0

View File

@ -137,7 +137,7 @@ function StaggerBar.prototype:CreateFrame()
end
function StaggerBar.prototype:CreateTimerBar()
self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK", "Timer")
self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM", "ARTWORK", "Timer")
self.CurrScale = 0

View File

@ -72,10 +72,20 @@ local IncapacitateCCList = {
19503,
-- Sleep
700,
-- Polymorph
-- Polymorph (rank 1)
118,
-- Also Polymorph
65801,
-- Polymorph rank 2
12824,
-- Polymorph rank 3
12825,
-- Polymorph rank 4
12826,
-- Polymorph: Pig
28272,
-- Also Polymorph: Pig
28285,
-- Polymorph: Turtle
28271,
-- Polymorph: Penguin
@ -350,7 +360,7 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
while debuff do
remaining = endTime - GetTime()
if debuffNames[spellId] and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
if (debuffNames[spellId] or debuffNames[debuff]) and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
if result[0] then
if result[2] < remaining then
result = {debuff, duration, remaining}

View File

@ -984,9 +984,9 @@ end
function IceTargetHealth.prototype:UpdateRaidTargetIcon()
if self.moduleSettings.raidIconOnTop then
self.frame.raidIcon:SetFrameStrata("MEDIUM")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
else
self.frame.raidIcon:SetFrameStrata("LOW")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
end
if not self.moduleSettings.showRaidIcon or (not UnitExists(self.unit) and (not self.configMode and not IceHUD.IceCore:IsInConfigMode())) then

View File

@ -1136,7 +1136,7 @@ do -- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
self.frame:SetScale(self.moduleSettings.scale)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.width)
self.frame:SetHeight(32)
self.frame:ClearAllPoints()
@ -1220,7 +1220,7 @@ function IceTargetInfo.prototype:CreateAuraFrame(aura, redraw)
if (not self.frame[auraFrame]) then
self.frame[auraFrame] = CreateFrame("Frame", nil, self.frame)
self.frame[auraFrame]:SetFrameStrata("BACKGROUND")
self.frame[auraFrame]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame[auraFrame]:SetWidth(1)
self.frame[auraFrame]:SetHeight(1)
self.frame[auraFrame]:Show()
@ -1244,7 +1244,7 @@ end
do
local function FrameFactory(frameType, parentFrame, inheritsFrame)
local frame = CreateFrame(frameType, nil, parentFrame, inheritsFrame)
frame:SetFrameStrata("BACKGROUND")
frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
frame:ClearAllPoints()
return frame
end
@ -1453,7 +1453,7 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
end
else
self.frame[auraFrame].iconFrames[i]:Hide()
buffData[aura][i] = nil
table.remove(buffData[aura], i)
end
end
end

View File

@ -314,7 +314,7 @@ function TargetOfTarget.prototype:CreateFrame()
self.frame:SetAttribute("unit", self.unit)
end
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.sizeToGap then
self.frame:SetWidth(self.settings.gap)
else
@ -368,7 +368,7 @@ function TargetOfTarget.prototype:CreateBarFrame()
self.frame.bg:SetTexture(0,0,0)
self.frame.bar:SetFrameStrata("BACKGROUND")
self.frame.bar:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.sizeToGap then
self.frame.bg:SetWidth(self.settings.gap + 2)
self.frame.bar:SetWidth(self.settings.gap)
@ -435,7 +435,7 @@ function TargetOfTarget.prototype:CreateDebuffFrame()
end
self.frame.debuffFrame = CreateFrame("Frame", nil, self.frame)
self.frame.debuffFrame:SetFrameStrata("BACKGROUND")
self.frame.debuffFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.debuffFrame:SetWidth(10)
self.frame.debuffFrame:SetHeight(self.height)
@ -451,7 +451,7 @@ function TargetOfTarget.prototype:CreateIconFrames(parent)
for i = 1, IceCore.BuffLimit do
buffs[i] = CreateFrame("Frame", nil, parent)
buffs[i]:SetFrameStrata("BACKGROUND")
buffs[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
buffs[i]:SetWidth(self.buffSize)
buffs[i]:SetHeight(self.buffSize)
buffs[i]:SetPoint("LEFT", (i-1) * self.buffSize + (i-1), 0)

View File

@ -231,7 +231,7 @@ end
-- create the aggro range indicator bar
function IceThreat.prototype:CreateAggroBar()
self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK", "Aggro")
self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND", "ARTWORK", "Aggro")
local r, g, b = self:GetColor("ThreatPullAggro")
if (self.settings.backgroundToggle) then

View File

@ -89,11 +89,11 @@ function Totems.prototype:GetOptions()
end,
order = 31
}
--[[
opts["hideBlizz"] = {
type = "toggle",
name = L["Hide Blizzard Frame"],
desc = L["Hides Blizzard Rune frame and disables all events related to it"],
desc = L["Hides Blizzard frame and disables all events related to it.\n\nNOTE: Blizzard attaches this UI to the player's unitframe, so if you have that hidden in PlayerHealth, then this won't do anything."],
get = function()
return self.moduleSettings.hideBlizz
end,
@ -110,7 +110,7 @@ function Totems.prototype:GetOptions()
end,
order = 32
}
--]]
opts["displayMode"] = {
type = 'select',
name = L["Totem orientation"],
@ -193,7 +193,7 @@ function Totems.prototype:GetDefaultSettings()
defaults["totemFontSize"] = 20
defaults["totemMode"] = "Graphical"
defaults["usesDogTagStrings"] = false
defaults["hideBlizz"] = true
defaults["hideBlizz"] = IceHUD.CanHookDestroyTotem
defaults["alwaysFullAlpha"] = false
defaults["displayMode"] = "Horizontal"
defaults["cooldownMode"] = "Cooldown"
@ -265,7 +265,7 @@ end
function Totems.prototype:CreateFrame()
Totems.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.totemSize*self.numTotems)
self.frame:SetHeight(1)
self.frame:ClearAllPoints()
@ -349,7 +349,7 @@ function Totems.prototype:CreateTotem(i, name)
self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetWidth(self.totemSize)
self.frame.graphical[i]:SetHeight(self.totemSize)
@ -380,7 +380,7 @@ function Totems.prototype:CreateTotem(i, name)
end
end
self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
self.frame.graphical[i].cd:ClearAllPoints()
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

View File

@ -1,5 +1,72 @@
# Changelog
v1.14.26:
- Update TOC for classic-era to 1.14.4
v1.14.25:
- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
- Added ability to adjust strata globally.
v1.14.24:
- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.
v1.14.23:
- Update Dragonflight TOC for 10.1.5
v1.14.22:
- Fixed reported issue with a Lua error on Wrath Classic clients. https://www.wowace.com/projects/ice-hud/issues/344
- Fixed Vigor module not working when riding Grotto Netherwing Drake (and theoretically all future Dragonriding mount types).
- Updated TOC for Wrath-Classic.
v1.14.21:
- Increased maximum scale/zoom to 400%, by request.
- Fixed TargetCC/FocusCC modules on Wrath Classic.
- Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
- Fixed Buff/Debuff Watchers showing an empty bar when set to Missing mode. If the background was disabled, this looked like just a floating spell icon.
- Fixed spell icons sometimes not showing up for custom bars until the tracked spell had been cast once.
v1.14.20:
- Added Winding Slitherdrake as recognized for the Dragonriding Vigor module
v1.14.19:
- Updated TOCs for 10.1.0
- Added addon icon for 10.1.0 clients
- Fixed Dragonriding Vigor charges not showing up in 10.1.0
- Fixed Vigor not always updating correctly when loading into the game or a new zone
v1.14.18:
- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
- Added option (enabled by default) to hide mod during cataloging.
- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
v1.14.17:
- Updated TOCs for 10.0.7
v1.14.16:
- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
- Fixed a reported error when playing Darkmoon Faire games.
- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
v1.14.15:
- Updated TOCs for 10.0.5
v1.14.14:
- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
v1.14.13:
- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)