mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 22:51:53 -05:00
Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
af74c9e3fe
|
|||
611f37a1f3
|
|||
5d8b83e5ef
|
|||
53fdb48b05
|
|||
b64294ca11
|
|||
0785265feb
|
|||
4007f1258b
|
32
IceCore.lua
32
IceCore.lua
@ -303,9 +303,23 @@ function IceCore.prototype:Enable(userToggle)
|
||||
end
|
||||
elseif (event == "UNIT_AURA") then
|
||||
local unit = ...
|
||||
if IceHUD.IceCore.settings.bHideDuringShellGame and unit == "player" and IceHUD:HasDebuffs("player", {271571})[1] and UnitInVehicle("player") then
|
||||
if unit ~= "player" then
|
||||
return
|
||||
end
|
||||
|
||||
if IceHUD.IceCore.settings.bHideDuringShellGame and IceHUD:HasAnyDebuff("player", {271571}) and UnitInVehicle("player") then
|
||||
self:RegisterEvent("UNIT_EXITED_VEHICLE")
|
||||
self:Hide()
|
||||
elseif C_Map then
|
||||
local bestMapID = C_Map.GetBestMapForUnit("player")
|
||||
if bestMapID ~= ZM_MAP_ID then
|
||||
return
|
||||
end
|
||||
|
||||
if IceHUD:HasAnyBuff("player", IceCore.zmPuzzleIds) then
|
||||
self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
self:Hide()
|
||||
end
|
||||
end
|
||||
elseif (event == "UNIT_EXITED_VEHICLE") then
|
||||
self:UnregisterEvent("UNIT_EXITED_VEHICLE")
|
||||
@ -314,30 +328,20 @@ function IceCore.prototype:Enable(userToggle)
|
||||
if C_Map then
|
||||
local bestMapID = C_Map.GetBestMapForUnit("player")
|
||||
if bestMapID == ZM_MAP_ID then
|
||||
if IceHUD:HasAnyBuff("player", IceCore.zmPuzzleIds) then
|
||||
self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
local puzzleStatus = IceHUD:HasBuffs("player", IceCore.zmPuzzleIds)
|
||||
for i=1, #puzzleStatus do
|
||||
if puzzleStatus[i] then
|
||||
self:Hide()
|
||||
end
|
||||
end
|
||||
else
|
||||
self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
end
|
||||
end
|
||||
elseif (event == "COMBAT_LOG_EVENT_UNFILTERED") then
|
||||
local _,subevent,_,_,_,_,_,_,destName,_,_,spellId = CombatLogGetCurrentEventInfo()
|
||||
|
||||
if subevent == "SPELL_AURA_APPLIED" then
|
||||
if destName == UnitName("player") then
|
||||
if IceCore.zmPuzzleMap[spellId] then
|
||||
self:Hide()
|
||||
end
|
||||
end
|
||||
elseif subevent == "SPELL_AURA_REMOVED" then
|
||||
if subevent == "SPELL_AURA_REMOVED" then
|
||||
if destName == UnitName("player") then
|
||||
if IceCore.zmPuzzleMap[spellId] then
|
||||
self:Show()
|
||||
self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
25
IceHUD.lua
25
IceHUD.lua
@ -36,6 +36,7 @@ IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
|
||||
IceHUD.CanTrackGCD = not IceHUD.WowClassic
|
||||
IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
|
||||
IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC
|
||||
IceHUD.ShouldUpdateTargetHealthEveryTick = IceHUD.WowClassicBC and GetCVarBool("predictedHealth")
|
||||
|
||||
IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
|
||||
|
||||
@ -493,6 +494,30 @@ do
|
||||
function IceHUD:HasDebuffs(unit, spellIDs, filter)
|
||||
return IceHUD:HasBuffs(unit, spellIDs, filter and filter.."|HARMFUL" or "HARMFUL")
|
||||
end
|
||||
|
||||
function IceHUD:HasAnyBuff(unit, spellIDs, filter)
|
||||
local buffs = IceHUD:HasBuffs(unit, spellIDs, filter)
|
||||
|
||||
for i=1, #buffs do
|
||||
if buffs[i] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
function IceHUD:HasAnyDebuff(unit, spellIDs, filter)
|
||||
local debuffs = IceHUD:HasDebuffs(unit, spellIDs, filter)
|
||||
|
||||
for i=1, #debuffs do
|
||||
if debuffs[i] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
function IceHUD:OnDisable()
|
||||
|
@ -1,5 +1,11 @@
|
||||
# Changelog
|
||||
|
||||
v1.13.13:
|
||||
|
||||
- Slight optimization of Zereth Mortis puzzle detection logic.
|
||||
- Fixed target health updating infrequently on Classic-BC.
|
||||
- Fixed reported error in TargetInvuln module.
|
||||
|
||||
v1.13.12:
|
||||
|
||||
- Hide IceHUD during Zereth Mortis puzzles
|
||||
|
@ -642,6 +642,10 @@ function IceTargetHealth.prototype:Enable(core)
|
||||
self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
|
||||
self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
|
||||
end
|
||||
|
||||
if IceHUD.ShouldUpdateTargetHealthEveryTick and self.unit == "target" then
|
||||
self.frame:SetScript("OnUpdate", function() self:Update(self.unit) end)
|
||||
end
|
||||
end
|
||||
|
||||
if (self.moduleSettings.hideBlizz) then
|
||||
@ -659,6 +663,10 @@ function IceTargetHealth.prototype:Disable(core)
|
||||
|
||||
UnregisterUnitWatch(self.frame)
|
||||
|
||||
if self.registerEvents and IceHUD.ShouldUpdateTargetHealthEveryTick and self.unit == "target" then
|
||||
self.frame:SetScript("OnUpdate", nil)
|
||||
end
|
||||
|
||||
if self.moduleSettings.hideBlizz then
|
||||
self:ShowBlizz()
|
||||
end
|
||||
|
@ -197,7 +197,7 @@ end
|
||||
function TargetInvuln.prototype:UpdateTargetBuffs(event, unit, isUpdate)
|
||||
local name, duration, remaining
|
||||
|
||||
if not isUpdate then
|
||||
if not isUpdate or not self.lastUpdateTime then
|
||||
self.buffName, self.buffDuration, self.buffRemaining = self:GetMaxbuffDuration(self.unit, self.buffList)
|
||||
else
|
||||
self.buffRemaining = math.max(0, self.buffRemaining - (GetTime() - self.lastUpdateTime))
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Changelog
|
||||
|
||||
v1.13.12:
|
||||
v1.13.13:
|
||||
|
||||
- Hide IceHUD during Zereth Mortis puzzles
|
||||
- Fixed default player and target frames coming back sometimes (github issue #19)
|
||||
- Updated TOC for 9.2.0 and 1.14.2
|
||||
- Slight optimization of Zereth Mortis puzzle detection logic.
|
||||
- Fixed target health updating infrequently on Classic-BC.
|
||||
- Fixed reported error in TargetInvuln module.
|
||||
|
Reference in New Issue
Block a user