Compare commits

...

12 Commits

13 changed files with 130 additions and 16 deletions

View File

@ -115,6 +115,7 @@ function IceCore.prototype:SetupDefaults()
bHideDuringPetBattles = true,
bHideInBarberShop = true,
bHideDuringShellGame = true,
bHideDuringCataloging = true,
},
global = {
lastRunVersion = 0,
@ -284,6 +285,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 +305,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 +319,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

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"

View File

@ -1,8 +1,8 @@
## Interface: 100002
## Interface-Retail: 100002
## Interface: 100007
## Interface-Retail: 100007
## Interface-Classic: 11403
## Interface-BCC: 20504
## Interface-Wrath: 30400
## Interface-Wrath: 30401
## Author: Parnic, originally created by Iceroth
## Name: IceHUD
## Title: IceHUD |cff7fff7f-Ace3-|r

View File

@ -1,8 +1,8 @@
## Interface: 100002
## Interface-Retail: 100002
## Interface: 100007
## Interface-Retail: 100007
## Interface-Classic: 11403
## Interface-BCC: 20504
## Interface-Wrath: 30400
## Interface-Wrath: 30401
## Title: IceHUD |cff7fff7f-Options-|r
## Author: Parnic
## Version: @project-version@

View File

@ -426,6 +426,24 @@ 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,
},
}
},

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 --
@ -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,30 @@
# Changelog
v1.14.18:
- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
- Added option (enabled by default) to hide mod during cataloging.
- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
v1.14.17:
- Updated TOCs for 10.0.7
v1.14.16:
- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
- Fixed a reported error when playing Darkmoon Faire games.
- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
v1.14.15:
- Updated TOCs for 10.0.5
v1.14.14:
- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
v1.14.13:
- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)

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
@ -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

@ -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

@ -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

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"

View File

@ -1,5 +1,30 @@
# Changelog
v1.14.18:
- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
- Added option (enabled by default) to hide mod during cataloging.
- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
v1.14.17:
- Updated TOCs for 10.0.7
v1.14.16:
- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
- Fixed a reported error when playing Darkmoon Faire games.
- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
v1.14.15:
- Updated TOCs for 10.0.5
v1.14.14:
- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
v1.14.13:
- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)