diff --git a/Libs/LibOpenRaid/ThingsToMantain_WarWithin.lua b/Libs/LibOpenRaid/ThingsToMantain_WarWithin.lua index 8d99e8f01..c6da526b9 100644 --- a/Libs/LibOpenRaid/ThingsToMantain_WarWithin.lua +++ b/Libs/LibOpenRaid/ThingsToMantain_WarWithin.lua @@ -630,7 +630,7 @@ do [157981] = {cooldown = 30, duration = 6, specs = {63}, talent = false, charges = 1, class = "MAGE", type = 8}, --Blast Wave [475] = {cooldown = 8, duration = 0, specs = {63, 64, 62}, talent = false, charges = 1, class = "MAGE", type = 7}, --Remove Curse [122] = {cooldown = 30, duration = 6, specs = {63, 64, 62}, talent = false, charges = 1, class = "MAGE", type = 8}, --Frost Nova - [157980] = {cooldown = 25, duration = 0, specs = {62}, talent = false, charges = 1, class = "MAGE", type = 8}, --Supernova + [157980] = {cooldown = 45, duration = 0, specs = {62}, talent = false, charges = 1, class = "MAGE", type = 8}, --Supernova [414660] = {cooldown = 120, duration = 60, specs = {63, 64, 62}, talent = false, charges = 1, class = "MAGE", type = 4, cdtype = "DR"}, --Mass Barrier [414664] = {cooldown = 300, duration = 12, specs = {63, 64, 62}, talent = false, charges = 1, class = "MAGE", type = 5}, --Mass Invisibility (only out of combat) diff --git a/boot.lua b/boot.lua index e82c367b6..9dee5bf30 100644 --- a/boot.lua +++ b/boot.lua @@ -19,8 +19,8 @@ local addonName, Details222 = ... local version, build, date, tvs = GetBuildInfo() - Details.build_counter = 13188 - Details.alpha_build_counter = 13188 --if this is higher than the regular counter, use it instead + Details.build_counter = 13189 + Details.alpha_build_counter = 13189 --if this is higher than the regular counter, use it instead Details.dont_open_news = true Details.game_version = version Details.userversion = version .. " " .. Details.build_counter diff --git a/functions/deathrecap.lua b/functions/deathrecap.lua index db7777561..68b288fe0 100644 --- a/functions/deathrecap.lua +++ b/functions/deathrecap.lua @@ -208,46 +208,48 @@ function Details222.InitRecap() end) end) - local header = {} - local headerTable = { + if (detailsFramework.IsDragonflightAndBeyond()) then + local header = {} + local headerTable = { ["name"] = {text = "Time", width = 70}, ["width"] = {text = "Width", width = 50}, ["align"] = {text = "Last Hit", width = 120}, ["type"] = {text = "Spell School", width = 70}, ["cd"] = {text = "Last Cooldown", width = 120}, - } - - local parent = _G["DeathRecapFrame"] - local headerFrame = detailsFramework:CreateHeader(parent, headerTable) - - local counter = 0 - local countToDie = 1 - local columnsCreated = {} - local countCallback = function() - countToDie = countToDie + 1 - if (countToDie > 12) then - Details:CaptureSet(false, "damage", true) + } + + local parent = _G["DeathRecapFrame"] + local headerFrame = detailsFramework:CreateHeader(parent, headerTable) + + local counter = 0 + local countToDie = 1 + local columnsCreated = {} + local countCallback = function() + countToDie = countToDie + 1 + if (countToDie > 12) then + Details:CaptureSet(false, "damage", true) + end end - end - local monitorDeaths = catchStr(unpack(Details.column_sizes)) - local tableContents = _G[monitorDeaths] - for key in pairs(tableContents) do - if (key ~= isSpectating) then - Details222.DHook(tableContents, key, countCallback) - columnsCreated[#columnsCreated+1] = {tableContents, key, countCallback} + local monitorDeaths = catchStr(unpack(Details.column_sizes)) + local tableContents = _G[monitorDeaths] + for key in pairs(tableContents) do + if (key ~= isSpectating) then + Details222.DHook(tableContents, key, countCallback) + columnsCreated[#columnsCreated+1] = {tableContents, key, countCallback} + end end - end - local okay, errorText = pcall(function() - ---@diagnostic disable-next-line: missing-parameter - local deathEventsScrollBox = detailsFramework:CreateScrollBox(parent, "DeathRecapEventsScrollFrame", function()end, columnsCreated) - deathEventsScrollBox:SetPoint("topleft", _G["DeathRecapFrame"], "topleft", 10, -50) - deathEventsScrollBox:SetSize(_G["DeathRecapFrame"]:GetWidth()-5, _G["DeathRecapFrame"]:GetHeight()-30) + local okay, errorText = pcall(function() + ---@diagnostic disable-next-line: missing-parameter + local deathEventsScrollBox = detailsFramework:CreateScrollBox(parent, "DeathRecapEventsScrollFrame", function()end, columnsCreated) + deathEventsScrollBox:SetPoint("topleft", _G["DeathRecapFrame"], "topleft", 10, -50) + deathEventsScrollBox:SetSize(_G["DeathRecapFrame"]:GetWidth()-5, _G["DeathRecapFrame"]:GetHeight()-30) - headerFrame:SetPoint("topleft", deathEventsScrollBox, "topleft", 2, -2) - headerFrame:SetPoint("topright", deathEventsScrollBox, "topright", -2, -2) - end) + headerFrame:SetPoint("topleft", deathEventsScrollBox, "topleft", 2, -2) + headerFrame:SetPoint("topright", deathEventsScrollBox, "topright", -2, -2) + end) + end end local openDetailsDeathRecapAtSegment = function(segment)