Update changelog

See 51e2debc4d for the PlayerFrame version of this (and reasoning for this)

IceCore.lua

@@ -41,6 +41,26 @@ IceCore.TextDecorationStyle = {
 	NoDecoration = L["No decoration"],
 }
 
+local ZM_MAP_ID = 1970
+IceCore.zmPuzzleIds = {
+	--Fugueal Protolock
+	366046,
+	366108,
+	359488,
+	--Mezzonic Protolock
+	366042,
+	366106,
+	351405,
+	--Cantaric Protolock
+	365840,
+	366107,
+	348792,
+}
+IceCore.zmPuzzleMap = {}
+for i=1, #IceCore.zmPuzzleIds do
+	IceCore.zmPuzzleMap[IceCore.zmPuzzleIds[i]] = true
+end
+
 local SUNDER_SPELL_ID = 7386
 local LACERATE_SPELL_ID = 33745
 local MAELSTROM_SPELL_ID = 53817
@@ -259,6 +279,10 @@ function IceCore.prototype:Enable(userToggle)
 		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
 		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
 	end
+	if C_Map then
+		self.IceHUDFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
+		self.IceHUDFrame:RegisterEvent("ZONE_CHANGED")
+	end
 	self.IceHUDFrame:RegisterEvent("UNIT_AURA")
 	self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
 		if (event == "PET_BATTLE_OPENING_START") then
@@ -286,6 +310,37 @@ function IceCore.prototype:Enable(userToggle)
 		elseif (event == "UNIT_EXITED_VEHICLE") then
 			self:UnregisterEvent("UNIT_EXITED_VEHICLE")
 			self:Show()
+		elseif (event == "PLAYER_ENTERING_WORLD" or event == "ZONE_CHANGED") then
+			if C_Map then
+				local bestMapID = C_Map.GetBestMapForUnit("player")
+				if bestMapID == ZM_MAP_ID then
+					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 destName == UnitName("player") then
+                    if IceCore.zmPuzzleMap[spellId] then
+                        self:Show()
+                    end
+                end
+            end
 		end
 	end)
 

IceHUD.lua

@@ -35,6 +35,7 @@ IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000
 IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
 IceHUD.CanTrackGCD = not IceHUD.WowClassic
 IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
+IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC
 
 IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
 

IceHUD.toc

@@ -1,7 +1,7 @@
-## Interface: 90105
-## Interface-Retail: 90105
-## Interface-Classic: 11401
-## Interface-BCC: 20502
+## Interface: 90200
+## Interface-Retail: 90200
+## Interface-Classic: 11402
+## Interface-BCC: 20503
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r

IceHUD_Options/IceHUD_Options.toc

@@ -1,7 +1,7 @@
-## Interface: 90105
-## Interface-Retail: 90105
-## Interface-Classic: 11401
-## Interface-BCC: 20502
+## Interface: 90200
+## Interface-Retail: 90200
+## Interface-Classic: 11402
+## Interface-BCC: 20503
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@

changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+v1.13.12:
+
+- Hide IceHUD during Zereth Mortis puzzles
+- Fixed default player and target frames coming back sometimes (github issue #19)
+- Updated TOC for 9.2.0 and 1.14.2
+
+v1.13.11:
+
+- Fixed totem bar dismissal for BC-Classic and Classic
+- Updated TOC for BC-Clasic
+
 v1.13.10:
 
 - Updated TOCs for 9.1.5 and 1.14.1

modules/PlayerHealth.lua

@@ -1407,15 +1407,18 @@ end
 
 
 function PlayerHealth.prototype:ShowBlizz()
-	PlayerFrame:Show()
-	PlayerFrame:GetScript("OnLoad")(PlayerFrame)
+	PlayerFrame:SetParent(self.OriginalPlayerFrameParent or UIParent)
 end
 
 
 function PlayerHealth.prototype:HideBlizz()
-	PlayerFrame:Hide()
+	if not self.PlayerFrameParent then
+		self.PlayerFrameParent = CreateFrame("Frame")
+		self.PlayerFrameParent:Hide()
+	end
 
-	PlayerFrame:UnregisterAllEvents()
+	self.OriginalPlayerFrameParent = PlayerFrame:GetParent()
+	PlayerFrame:SetParent(self.PlayerFrameParent)
 end
 
 function PlayerHealth.prototype:HideBlizzardParty()

modules/TargetHealth.lua

@@ -1057,20 +1057,25 @@ end
 
 
 function IceTargetHealth.prototype:ShowBlizz()
-	TargetFrame:Show()
-	TargetFrame:GetScript("OnLoad")(TargetFrame)
-
-	ComboFrame:Show()
-	ComboFrame:GetScript("OnLoad")(ComboFrame)
+	TargetFrame:SetParent(self.OriginalTargetFrameParent or UIParent)
+	ComboFrame:SetParent(self.OriginalComboFrameParent or UIParent)
 end
 
 
 function IceTargetHealth.prototype:HideBlizz()
-	TargetFrame:Hide()
-	TargetFrame:UnregisterAllEvents()
+	if not self.TargetFrameParent then
+		self.TargetFrameParent = CreateFrame("Frame")
+		self.TargetFrameParent:Hide()
+	end
+	if not self.ComboFrameParent then
+		self.ComboFrameParent = CreateFrame("Frame")
+		self.ComboFrameParent:Hide()
+	end
 
-	ComboFrame:Hide()
-	ComboFrame:UnregisterAllEvents()
+	self.OriginalTargetFrameParent = TargetFrame:GetParent()
+	TargetFrame:SetParent(self.TargetFrameParent)
+	self.OriginalComboFrameParent = ComboFrame:GetParent()
+	ComboFrame:SetParent(self.ComboFrameParent)
 end
 
 function IceTargetHealth.prototype:UpdateBar(scale, color, alpha)

modules/Totems.lua

@@ -339,7 +339,6 @@ function Totems.prototype:CreateTotem(i, name)
 		return
 	end
 	local haveTotem, name, startTime, duration, icon = GetTotemInfo(i)
-	local bWasNewFrame = false
 	if (not self.frame.graphical[i]) then
 		self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
 		self.frame.graphical[i].totem = self.frame.graphical[i]:CreateTexture(nil, "LOW")
@@ -348,7 +347,6 @@ function Totems.prototype:CreateTotem(i, name)
 
 		self.frame.graphical[i].totem:SetTexture(icon)
 		self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
-		bWasNewFrame = true
 	end
 
 	self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
@@ -405,18 +403,19 @@ function Totems.prototype:CreateTotem(i, name)
 		self.frame.graphical[i]:EnableMouse(true)
 		self.frame.graphical[i]:SetScript("OnEnter", self.graphicalOnEnter)
 		self.frame.graphical[i]:SetScript("OnLeave", self.graphicalOnLeave)
+		if IceHUD.CanHookDestroyTotem then
+			self.frame.graphical[i]:SetScript("OnMouseUp", self.graphicalOnMouseUp)
+		end
 	else
 		self.frame.graphical[i]:EnableMouse(false)
 		self.frame.graphical[i]:SetScript("OnEnter", nil)
 		self.frame.graphical[i]:SetScript("OnLeave", nil)
+		if IceHUD.CanHookDestroyTotem then
+			self.frame.graphical[i]:SetScript("OnMouseUp", nil)
+		end
 	end
 	self.frame.graphical[i].slot = i
 	self.frame.graphical[i].name = name
-
-	-- it looks like HookScript will continue to add handlers every time instead of replacing them like SetScript
-	if (bWasNewFrame) then
-		--self.frame.graphical[i]:HookScript("OnMouseUp", self.graphicalOnMouseUp)
-	end
 end
 
 -- Load us up

this_version.md

@@ -1,5 +1,7 @@
 # Changelog
 
-v1.13.10:
+v1.13.12:
 
-- Updated TOCs for 9.1.5 and 1.14.1
+- 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