From 5798a17475c172cda76bd4186e5d12cf48a78e63 Mon Sep 17 00:00:00 2001 From: MysticalOS Date: Sun, 16 Jun 2024 00:40:44 -0400 Subject: [PATCH] Fix numerous cases where count was missing, or wrong object type was set (also causing count to be missing) Disabled some false diagnostics reports as well --- DBM-Raids-Shadowlands/CastleNathria/SireDenathrius.lua | 2 +- DBM-Raids-Shadowlands/CastleNathria/TheCouncilofBlood.lua | 2 +- .../SanctumOfDomination/SylvanasWindrunner.lua | 1 + DBM-Raids-Shadowlands/SanctumOfDomination/TheTarragrue.lua | 6 +++--- DBM-Raids-Shadowlands/Sepulcher/AnduinWrynn.lua | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/DBM-Raids-Shadowlands/CastleNathria/SireDenathrius.lua b/DBM-Raids-Shadowlands/CastleNathria/SireDenathrius.lua index ce03d3a..7118a5d 100644 --- a/DBM-Raids-Shadowlands/CastleNathria/SireDenathrius.lua +++ b/DBM-Raids-Shadowlands/CastleNathria/SireDenathrius.lua @@ -72,7 +72,7 @@ local timerNextPhase = mod:NewPhaseTimer(16.5, 328117, nil, nil, nil, 6, n --Stage Two: The Crimson Chorus mod:AddTimerLine(DBM:EJ_GetSectionInfo(22059)) ----Crimson Cabalist -local warnCrimsonCabalists = mod:NewSpellAnnounce("ej22131", 2, 329711) +local warnCrimsonCabalists = mod:NewCountAnnounce("ej22131", 2, 329711) local warnCrescendo = mod:NewSpellAnnounce(336162, 3) local specWarnCrescendo = mod:NewSpecialWarningDodge(336162, false, nil, nil, 2, 2) diff --git a/DBM-Raids-Shadowlands/CastleNathria/TheCouncilofBlood.lua b/DBM-Raids-Shadowlands/CastleNathria/TheCouncilofBlood.lua index c073059..1b35734 100644 --- a/DBM-Raids-Shadowlands/CastleNathria/TheCouncilofBlood.lua +++ b/DBM-Raids-Shadowlands/CastleNathria/TheCouncilofBlood.lua @@ -77,7 +77,7 @@ local timerDredgerServantsCD = mod:NewCDTimer(44.3, 330978, nil, nil, nil, 1 mod:AddTimerLine(DBM:EJ_GetSectionInfo(22199))--Two are dead local warnCastellansCadre = mod:NewSpellAnnounce(330965, 2)--Two bosses dead local warnFixate = mod:NewTargetAnnounce(330967, 3)--Two bosses dead (Veteran Stoneguard) -local warnSintouchedBlade = mod:NewSpellAnnounce(346790, 4)--Veteran Stoneguard +local warnSintouchedBlade = mod:NewCountAnnounce(346790, 4)--Veteran Stoneguard local specWarnFixate = mod:NewSpecialWarningRun(330967, nil, nil, nil, 4, 2)--Two bosses dead diff --git a/DBM-Raids-Shadowlands/SanctumOfDomination/SylvanasWindrunner.lua b/DBM-Raids-Shadowlands/SanctumOfDomination/SylvanasWindrunner.lua index dd9ea6c..6f195b4 100644 --- a/DBM-Raids-Shadowlands/SanctumOfDomination/SylvanasWindrunner.lua +++ b/DBM-Raids-Shadowlands/SanctumOfDomination/SylvanasWindrunner.lua @@ -668,6 +668,7 @@ function mod:SPELL_CAST_SUCCESS(args) specWarnMerciless:Show(self.vb.merciCount.." / "..soakCount.."x") specWarnMerciless:Play("helpsoak") else + ---@diagnostic disable-next-line: param-type-mismatch warnMerciless:Show(self.vb.merciCount.." ("..soakCount.."x)") end timerMercilessCD:Start(self.vb.merciCount < 7 and 21 or 41, self.vb.merciCount+1) diff --git a/DBM-Raids-Shadowlands/SanctumOfDomination/TheTarragrue.lua b/DBM-Raids-Shadowlands/SanctumOfDomination/TheTarragrue.lua index ce86e80..ef28fba 100644 --- a/DBM-Raids-Shadowlands/SanctumOfDomination/TheTarragrue.lua +++ b/DBM-Raids-Shadowlands/SanctumOfDomination/TheTarragrue.lua @@ -32,9 +32,9 @@ local warnChainsofEternity = mod:NewTargetNoFilterAnnounce(347269, 2) local warnAnnihilatingSmash = mod:NewTargetAnnounce(347274, 4) local warnPedatorsHowl = mod:NewTargetAnnounce(347283, 2) local warnForgottenTorments = mod:NewSoonAnnounce(352368, 2)--When it's soon -local warnUpperReachesMight = mod:NewSpellAnnounce(352382, 2)--When it's happening -local warnMortregarsEchoes = mod:NewSpellAnnounce(352389, 2)--When it's happening -local warnSoulforgeHeat = mod:NewSpellAnnounce(352398, 2)--When it's happening +local warnUpperReachesMight = mod:NewCountAnnounce(352382, 2)--When it's happening +local warnMortregarsEchoes = mod:NewCountAnnounce(352389, 2)--When it's happening +local warnSoulforgeHeat = mod:NewCountAnnounce(352398, 2)--When it's happening local warnTheJailersGaze = mod:NewTargetNoFilterAnnounce(347369, 4) mod:AddBoolOption("warnRemnant", false, "announce", nil, nil, nil, 352368)--3 options are combined into 1, so they don't need bundling local warnRemantPhysical = mod:NewCountAnnounce(352384, 2, nil, nil, false)--Physical diff --git a/DBM-Raids-Shadowlands/Sepulcher/AnduinWrynn.lua b/DBM-Raids-Shadowlands/Sepulcher/AnduinWrynn.lua index b508800..1475d0c 100644 --- a/DBM-Raids-Shadowlands/Sepulcher/AnduinWrynn.lua +++ b/DBM-Raids-Shadowlands/Sepulcher/AnduinWrynn.lua @@ -37,7 +37,7 @@ mod:RegisterEventsInCombat( --]] --Stage One: Kingsmourne Hungers mod:AddTimerLine(DBM:EJ_GetSectionInfo(24462)) -local warnBefouledBarrier = mod:NewSpellAnnounce(365295, 3, nil, nil, 300531) +local warnBefouledBarrier = mod:NewCountAnnounce(365295, 3, nil, nil, 300531) local warnWickedStar = mod:NewTargetCountAnnounce(365030, 3, nil, nil, nil, nil, nil, nil, true) local warnDominationWordPain = mod:NewTargetNoFilterAnnounce(366849, 3, nil, "Healer", 249194)