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
DeadlyBossMods · Jun 16, 2024 · 61546dd · 61546dd
1 parent 94d5875
commit 61546dd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/DBM-Raids-WoTLK/Icecrown/FrostwingHalls/Valithria.lua b/DBM-Raids-WoTLK/Icecrown/FrostwingHalls/Valithria.lua
@@ -27,7 +27,7 @@ mod:RegisterEventsInCombat(
 local warnCorrosion			= mod:NewStackAnnounce(70751, 2, nil, false)
 local warnGutSpray			= mod:NewTargetAnnounce(70633, 3, nil, "Tank|Healer")
 local warnManaVoid			= mod:NewSpellAnnounce(71179, 2, nil, "ManaUser")
-local warnSupression		= mod:NewSpellAnnounce(70588, 3)
+local warnSupression		= mod:NewTargetAnnounce(70588, 3)
 local warnPortalSoon		= mod:NewSoonAnnounce(72483, 2)
 local warnPortal			= mod:NewSpellAnnounce(72483, 3)
 local warnPortalOpen		= mod:NewAnnounce("WarnPortalOpen", 4, 72483, nil, nil, nil, 72483)

diff --git a/DBM-Raids-WoTLK/Icecrown/TheCrimsonHall/BPCouncil.lua b/DBM-Raids-WoTLK/Icecrown/TheCrimsonHall/BPCouncil.lua
@@ -177,7 +177,7 @@ end
 function mod:CHAT_MSG_RAID_BOSS_EMOTE(msg, _, _, _, target)
 	if msg:match(L.EmpoweredFlames) and target then
 		if self:IsTrivial() then return end
-		target = DBM:GetUnitFullName(target)
+		target = DBM:GetUnitFullName(target) or target
 		if target == UnitName("player") then
 			specWarnEmpoweredFlames:Show()
 			specWarnEmpoweredFlames:Play("justrun")

diff --git a/DBM-Raids-WoTLK/Icecrown/TheCrimsonHall/Lanathel.lua b/DBM-Raids-WoTLK/Icecrown/TheCrimsonHall/Lanathel.lua
@@ -192,7 +192,7 @@ mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
 
 function mod:CHAT_MSG_RAID_BOSS_EMOTE(msg, _, _, _, target)
 	if msg:match(L.SwarmingShadows) and target then
-		target = DBM:GetUnitFullName(target)
+		target = DBM:GetUnitFullName(target) or target
 		timerNextSwarmingShadows:Start()
 		if target == UnitName("player") then
 			specWarnSwarmingShadows:Show()

diff --git a/DBM-Raids-WoTLK/Naxx/FrostwyrmLair/Kel'Thuzad.lua b/DBM-Raids-WoTLK/Naxx/FrostwyrmLair/Kel'Thuzad.lua
@@ -122,10 +122,12 @@ function mod:SPELL_CAST_SUCCESS(args)
 				specWarnFissureYou:Play("targetyou")
 				yellFissure:Yell()
 			else
+				---@diagnostic disable-next-line: param-type-mismatch
 				warnFissure:Show(args.destName)
 				warnFissure:Play("watchstep")
 			end
 		else
+			---@diagnostic disable-next-line: param-type-mismatch
 			warnFissure:Show()
 			warnFissure:Play("watchstep")
 		end

diff --git a/DBM-Raids-WoTLK/Naxx/MilitaryQuarter/Horsemen.lua b/DBM-Raids-WoTLK/Naxx/MilitaryQuarter/Horsemen.lua
@@ -73,10 +73,12 @@ function mod:SPELL_CAST_SUCCESS(args)
 				specWarnVoidZone:Play("targetyou")
 				yellVoidZone:Yell()
 			else
+				---@diagnostic disable-next-line: param-type-mismatch
 				warnVoidZone:Show(args.destName)
 			end
 		else
 			if self:AntiSpam(3, 2) then--Have to antispam this way since can't by distance in classic
+				---@diagnostic disable-next-line: param-type-mismatch
 				warnVoidZone:Show()
 				warnVoidZone:Play("watchstep")
 			end

diff --git a/DBM-Raids-WoTLK/Naxx/PlagueQuarter/Loatheb.lua b/DBM-Raids-WoTLK/Naxx/PlagueQuarter/Loatheb.lua
@@ -14,7 +14,7 @@ mod:RegisterEventsInCombat(
 
 local warnSporeNow			= mod:NewCountAnnounce(29234, 2, "134530")
 local warnSporeSoon			= mod:NewSoonAnnounce(29234, 1, "134530")
-local warnDoomNow			= mod:NewSpellAnnounce(29204, 3)
+local warnDoomNow			= mod:NewCountAnnounce(29204, 3)
 local warnRemoveCurse		= mod:NewSpellAnnounce(30281, 3)
 local warnHealSoon			= mod:NewAnnounce("WarningHealSoon", 4, 55593, nil, nil, nil, 55593)
 local warnHealNow			= mod:NewAnnounce("WarningHealNow", 1, 55593, false, nil, nil, 55593)