From 038ea166426aae34235de0a687d3557e8a6b5d38 Mon Sep 17 00:00:00 2001 From: Parnic Date: Tue, 30 Apr 2024 23:16:42 -0500 Subject: [PATCH] Support Cataclysm Classic --- .github/workflows/release.yml | 6 ++++++ IceHUD.lua | 6 +++++- IceHUD.toc | 1 + IceHUD_Options/IceHUD_Options.toc | 1 + modules/TargetOfTarget.lua | 4 ++-- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47a4bf5..5b2bcec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,3 +56,9 @@ jobs: uses: BigWigsMods/packager@v2 with: args: -g wrath -w 0 + + - name: Package and release for Cataclysm + uses: BigWigsMods/packager@v2 + with: + args: -g cata -w 0 + \ No newline at end of file diff --git a/IceHUD.lua b/IceHUD.lua index b01b3b5..59a2fe4 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -20,10 +20,12 @@ if GetClassicExpansionLevel then IceHUD.WowClassic = GetClassicExpansionLevel() == 0 IceHUD.WowClassicBC = GetClassicExpansionLevel() == 1 IceHUD.WowClassicWrath = GetClassicExpansionLevel() == 2 + IceHUD.WowClassicCataclysm = GetClassicExpansionLevel() == 3 else IceHUD.WowClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC IceHUD.WowClassicBC = false IceHUD.WowClassicWrath = false + IceHUD.WowClassicCataclysm = false if WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then if not LE_EXPANSION_LEVEL_CURRENT or LE_EXPANSION_LEVEL_CURRENT == LE_EXPANSION_BURNING_CRUSADE then IceHUD.WowClassicBC = true @@ -32,6 +34,8 @@ else end elseif WOW_PROJECT_WRATH_CLASSIC and WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC then IceHUD.WowClassicWrath = true + elseif WOW_PROJECT_CATACLYSM_CLASSIC and WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC then + IceHUD.WowClassicCataclysm = true end end @@ -52,7 +56,7 @@ IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000 IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic or IceHUD.WowVer >= 11500 IceHUD.CanTrackGCD = not IceHUD.WowClassic or IceHUD.WowVer >= 11500 IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000 -IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.WowClassicWrath +IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.WowClassicWrath or IceHUD.WowClassicCataclysm IceHUD.ShouldUpdateTargetHealthEveryTick = (IceHUD.WowClassic or IceHUD.WowClassicBC) and GetCVarBool("predictedHealth") IceHUD.UsesUIPanelButtonTemplate = IceHUD.WowVer >= 50000 or not IceHUD.WowMain IceHUD.EventExistsSpellcastInterruptible = IceHUD.WowVer >= 30200 and not IceHUD.WowClassicWrath diff --git a/IceHUD.toc b/IceHUD.toc index fe3e0fc..9bb4565 100644 --- a/IceHUD.toc +++ b/IceHUD.toc @@ -3,6 +3,7 @@ ## Interface-Classic: 11502 ## Interface-BCC: 20504 ## Interface-Wrath: 30403 +## Interface-Cata: 40400 ## Author: Parnic, originally created by Iceroth ## Name: IceHUD ## Title: IceHUD |cff7fff7f-Ace3-|r diff --git a/IceHUD_Options/IceHUD_Options.toc b/IceHUD_Options/IceHUD_Options.toc index a06b39b..4a3d682 100644 --- a/IceHUD_Options/IceHUD_Options.toc +++ b/IceHUD_Options/IceHUD_Options.toc @@ -3,6 +3,7 @@ ## Interface-Classic: 11502 ## Interface-BCC: 20504 ## Interface-Wrath: 30403 +## Interface-Cata: 40400 ## Title: IceHUD |cff7fff7f-Options-|r ## Author: Parnic ## Version: @project-version@ diff --git a/modules/TargetOfTarget.lua b/modules/TargetOfTarget.lua index 367a336..0692745 100644 --- a/modules/TargetOfTarget.lua +++ b/modules/TargetOfTarget.lua @@ -410,7 +410,7 @@ function TargetOfTarget.prototype:CreateToTFrame() self.frame.totName:SetHeight(self.moduleSettings.moduleHeight) self.frame.totName:SetJustifyH("LEFT") - self.frame.totName:SetJustifyV("CENTER") + self.frame.totName:SetJustifyV("MIDDLE") self.frame.totName:SetPoint("LEFT", self.frame, "LEFT", 0, -1) self.frame.totName:Show() @@ -422,7 +422,7 @@ function TargetOfTarget.prototype:CreateToTHPFrame() self.frame.totHealth:SetHeight(self.moduleSettings.moduleHeight) self.frame.totHealth:SetJustifyH("RIGHT") - self.frame.totHealth:SetJustifyV("CENTER") + self.frame.totHealth:SetJustifyV("MIDDLE") self.frame.totHealth:SetPoint("RIGHT", self.frame, "RIGHT", 0, 0) self.frame.totHealth:Show()