diff --git a/ElvUI_Libraries/Core/oUF/elements/castbar.lua b/ElvUI_Libraries/Core/oUF/elements/castbar.lua index ca41b88782..127846b173 100644 --- a/ElvUI_Libraries/Core/oUF/elements/castbar.lua +++ b/ElvUI_Libraries/Core/oUF/elements/castbar.lua @@ -115,13 +115,14 @@ local GetUnitEmpowerHoldAtMaxTime = GetUnitEmpowerHoldAtMaxTime -- GLOBALS: CastingBarFrame, CastingBarFrame_OnLoad, CastingBarFrame_SetUnit local tradeskillCurrent, tradeskillTotal, mergeTradeskill = 0, 0, false -local specialCast = { -- ms duration - [2643] = 500, -- Multishot - [14288] = 500, -- Multishot - [14289] = 500, -- Multishot - [14290] = 500, -- Multishot - [19434] = 3000, -- Aimed Shot -} +local specialCast = {} -- ms duration +if oUF.isClassic then + specialCast[2643] = 500 -- Multishot + specialCast[14288] = 500 -- Multishot + specialCast[14289] = 500 -- Multishot + specialCast[14290] = 500 -- Multishot + specialCast[19434] = 3000 -- Aimed Shot +end -- end block local function resetAttributes(self) diff --git a/ElvUI_Libraries/Core/oUF/init.lua b/ElvUI_Libraries/Core/oUF/init.lua index 189d90eff5..37a79bf8ab 100644 --- a/ElvUI_Libraries/Core/oUF/init.lua +++ b/ElvUI_Libraries/Core/oUF/init.lua @@ -1,9 +1,15 @@ local _, ns = ... -ns.oUF = {} -ns.oUF.Private = {} +local oUF = { Private = {} } +ns.oUF = oUF -ns.oUF.isRetail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE -ns.oUF.isClassic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC -ns.oUF.isTBC = WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC -ns.oUF.isWrath = WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC -ns.oUF.isCata = WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC +oUF.isTBC = WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC -- not used +oUF.isCata = WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC +oUF.isWrath = WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC +oUF.isRetail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE +oUF.isClassic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC + +local season = C_Seasons and C_Seasons.GetActiveSeason() +oUF.isClassicHC = season == 3 -- Hardcore +oUF.isClassicSOD = season == 2 -- Season of Discovery +oUF.isClassicAnniv = season == 11 -- Anniversary +oUF.isClassicAnnivHC = season == 12 -- Anniversary Hardcore