diff --git a/Libs/LibOpenRaid/LibOpenRaid.lua b/Libs/LibOpenRaid/LibOpenRaid.lua index 7237ccce..08867e06 100644 --- a/Libs/LibOpenRaid/LibOpenRaid.lua +++ b/Libs/LibOpenRaid/LibOpenRaid.lua @@ -68,7 +68,7 @@ if (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE and not isExpansion_Dragonflight()) t end local major = "LibOpenRaid-1.0" -local CONST_LIB_VERSION = 66 +local CONST_LIB_VERSION = 67 LIB_OPEN_RAID_CAN_LOAD = false local unpack = table.unpack or _G.unpack diff --git a/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua b/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua index fe3b34f0..c3ff23ea 100644 --- a/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua +++ b/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua @@ -287,6 +287,7 @@ LIB_OPEN_RAID_COOLDOWNS_INFO = { [183752] = {class = "DEMONHUNTER", specs = {577, 581}, cooldown = 15, silence = 3, talent = false, cooldownWithTalent = false, cooldownTalentId = false, type = 6, charges = 1}, --Disrupt [19647] = {class = "WARLOCK", specs = {265, 266, 267}, cooldown = 24, silence = 6, talent = false, cooldownWithTalent = false, cooldownTalentId = false, pet = 417, type = 6, charges = 1}, --Spell Lock (pet felhunter ability) [89766] = {class = "WARLOCK", specs = {266}, cooldown = 30, silence = 4, talent = false, cooldownWithTalent = false, cooldownTalentId = false, pet = 17252, type = 6, charges = 1}, --Axe Toss (pet felguard ability) + [351338] = {class = "EVOKER", specs = {1467, 1468}, cooldown = 40, silence = 4, talent = false, cooldownWithTalent = false, cooldownTalentId = false, charges = 1, type = 6}, --Quell (Evoker) --paladin -- 65 - Holy @@ -570,6 +571,29 @@ LIB_OPEN_RAID_COOLDOWNS_INFO = { [114018] = {cooldown = 360, duration = 15, specs = {259, 260, 261}, talent = false, charges = 1, class = "ROGUE", type = 5}, --Shroud of Concealment [1856] = {cooldown = 120, duration = 3, specs = {259, 260, 261}, talent = false, charges = 1, class = "ROGUE", type = 1}, --Vanish [79140] = {cooldown = 120, duration = 20, specs = {259}, talent = false, charges = 1, class = "ROGUE", type = 1}, --Vendetta + + --evoker + -- 1467 - Devastation + -- 1468 - Preservation + --[374251] = {cooldown = 60, duration = 0, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 7}, --Cauterizing Flame + --[365585] = {cooldown = 8, duration = 0, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 7}, --Expunge + --[360823] = {cooldown = 8, duration = 0, specs = {1468}, talent = false, charges = 1, class = "EVOKER", type = 7}, --Naturalize + [357210] = {cooldown = 120, duration = 0, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 1}, --Deep Breath + [375087] = {cooldown = 120, duration = 0, specs = {1467}, talent = false, charges = 1, class = "EVOKER", type = 1}, --Dragonrage + [359816] = {cooldown = 120, duration = 15, specs = {1468}, talent = false, charges = 1, class = "EVOKER", type = 4}, --Dream Flight + [370960] = {cooldown = 180, duration = 4.4, specs = {1468}, talent = false, charges = 1, class = "EVOKER", type = 2}, --Emerald Communion + + [358385] = {cooldown = 90, duration = 0, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 8}, --Landslide + [372048] = {cooldown = 120, duration = 10, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 8}, --Oppressing Roar + [363916] = {cooldown = 90, duration = 12, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 2}, --Obsidian Scales + [374348] = {cooldown = 90, duration = 8, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 2}, --Renewing Blaze + + [370665] = {cooldown = 60, duration = 0, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 5}, --Rescue + [363534] = {cooldown = 240, duration = 5, specs = {1468}, talent = false, charges = 1, class = "EVOKER", type = 4}, --Rewind + --[370537] = {cooldown = 90, duration = 30, specs = {1468}, talent = false, charges = 1, class = "EVOKER", type = 4}, --Stasis + [357170] = {cooldown = 60, duration = 8, specs = {1468}, talent = false, charges = 1, class = "EVOKER", type = 3}, --Time Dilation + [374968] = {cooldown = 120, duration = 10, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 5}, --Time Spiral + [374227] = {cooldown = 120, duration = 8, specs = {1467, 1468}, talent = false, charges = 1, class = "EVOKER", type = 4}, --Zephyr } --this table store all cooldowns the player currently have available @@ -584,9 +608,6 @@ for spellID,spellData in pairs(LIB_OPEN_RAID_COOLDOWNS_INFO) do end end --- DF Evoker -LIB_OPEN_RAID_COOLDOWNS_BY_SPEC[1467] = {}; -LIB_OPEN_RAID_COOLDOWNS_BY_SPEC[1468] = {}; --[=[ Spell customizations: diff --git a/boot.lua b/boot.lua index 426a0f1f..fed4e3d2 100644 --- a/boot.lua +++ b/boot.lua @@ -30,7 +30,7 @@ local gameVersionPrefix = "Unknown Game Version - You're probably using a Details! not compatible with this version of the Game" --these are the game versions currently compatible with this Details! versions if (DetailsFramework.IsWotLKWow() or DetailsFramework.IsShadowlandsWow() or DetailsFramework.IsDragonflight()) then - gameVersionPrefix = "WSD" + gameVersionPrefix = "WD" end Details.gameVersionPrefix = gameVersionPrefix diff --git a/core/parser.lua b/core/parser.lua index b677180e..30d9235a 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -595,6 +595,7 @@ _detalhes:Msg(hitLine .. targetLine) _detalhes.WhoAggroTimer = nil + Details.bossTargetAtPull = nil end local lastRecordFound = {id = 0, diff = 0, combatTime = 0} @@ -953,6 +954,7 @@ _detalhes.WhoAggroTimer = C_Timer.NewTimer(0.1, who_aggro) _detalhes.WhoAggroTimer.HitBy = "|cFFFFFF00First Hit|r: " .. (link or "") .. " from " .. (who_name or "Unknown") + print("debug:", _detalhes.WhoAggroTimer.HitBy) end _detalhes:EntrarEmCombate(who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags) @@ -5088,7 +5090,17 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 end if (not _detalhes.WhoAggroTimer and _detalhes.announce_firsthit.enabled) then - _detalhes.WhoAggroTimer = C_Timer.NewTimer(0.5, who_aggro) + _detalhes.WhoAggroTimer = C_Timer.NewTimer(0.1, who_aggro) + for i = 1, 5 do + local boss = UnitExists("boss" .. i) + if (boss) then + local targetName = UnitName ("boss" .. i .. "target") + if (targetName and type(targetName) == "string") then + Details.bossTargetAtPull = targetName + break + end + end + end end if (IsInGuild() and IsInRaid() and _detalhes.announce_damagerecord.enabled and _detalhes.StorageLoaded) then @@ -5230,11 +5242,13 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 function _detalhes.parser_functions:PLAYER_REGEN_DISABLED(...) C_Timer.After(0, function() - if (UnitExists("boss1")) then - local bossTarget = UnitName("boss1target") - Details.bossTargetAtPull = bossTarget - else - Details.bossTargetAtPull = nil + if (not Details.bossTargetAtPull) then + if (UnitExists("boss1")) then + local bossTarget = UnitName("boss1target") + if (bossTarget) then + Details.bossTargetAtPull = bossTarget + end + end end end) diff --git a/functions/savedata.lua b/functions/savedata.lua index 5c856765..f4f9addb 100644 --- a/functions/savedata.lua +++ b/functions/savedata.lua @@ -4,16 +4,25 @@ local _detalhes = _G._detalhes function _detalhes:WipeConfig() local Loc = LibStub("AceLocale-3.0"):GetLocale ( "Details" ) - - local b = CreateFrame("button", "DetailsResetConfigButton", UIParent) - tinsert(UISpecialFrames, "DetailsResetConfigButton") - - DetailsFramework:ApplyStandardBackdrop(b) - b:SetSize(250, 40) - b:SetText(Loc ["STRING_SLASH_WIPECONFIG_CONFIRM"]) - b:SetScript("OnClick", function() _detalhes.wipe_full_config = true; ReloadUI(); end) - b:SetPoint("center", UIParent, "center", 0, 0) + local wipeButton = CreateFrame("button", "DetailsResetConfigButton", UIParent, "BackdropTemplate") + wipeButton:SetSize(270, 40) + wipeButton:SetScript("OnClick", function() _detalhes.wipe_full_config = true; ReloadUI(); end) + wipeButton:SetPoint("center", UIParent, "center", 0, 0) + + tinsert(UISpecialFrames, "DetailsResetConfigButton") + + DetailsFramework:ApplyStandardBackdrop(wipeButton) + + local label = DetailsFramework:CreateLabel(wipeButton, Loc ["STRING_SLASH_WIPECONFIG_CONFIRM"]) + label:SetPoint("center", 0, 0) + + wipeButton.close_button = CreateFrame("Button", nil, wipeButton, "UIPanelCloseButton") + wipeButton.close_button:SetWidth(16) + wipeButton.close_button:SetHeight(16) + wipeButton.close_button:SetPoint("TOPRIGHT", wipeButton, "TOPRIGHT", -1, -1) + wipeButton.close_button:SetText("X") + wipeButton.close_button:SetFrameLevel(wipeButton:GetFrameLevel()+5) end local is_exception = {