Aq40 update

DBM-Raids-Vanilla/AQ40/AQ40Trash.lua

@@ -109,7 +109,7 @@ function mod:SPELL_AURA_APPLIED(args)
 		elseif UnitGUID("pet") and UnitGUID("pet") == args.destGUID then
 			specWarnPlague:Show()
 			specWarnPlague:Play("runout")
-		else
+		elseif args.destName then -- I've seen events without a target for some reason, avoid the "on unknown" warning in this case
 			warnPlague:Show(args.destName)
 		end
 		self:TrackTrashAbility(args.sourceGUID, "Plague", args.sourceRaidFlags, args.sourceName)
@@ -431,10 +431,10 @@ function mod:ScanTrashAbilities(uid)
 	if DBM:UnitBuff(uid, 19595) then
 		self:TrackTrashAbility(guid, "ShadowFrostReflect", raidFlags, name)
 	end
-	if DBM:UnitBuff(uid, 474564) then
+	if DBM:UnitBuff(uid, 474564, 2834) then
 		self:TrackTrashAbility(guid, "Thunderclap", raidFlags, name)
 	end
-	if DBM:UnitBuff(uid, 474565) then
+	if DBM:UnitBuff(uid, 474565, 2148) then
 		self:TrackTrashAbility(guid, "ShadowStorm", raidFlags, name)
 	end
 	if DBM:UnitBuff(uid, 474570) then
@@ -443,8 +443,16 @@ function mod:ScanTrashAbilities(uid)
 	if DBM:UnitBuff(uid, 474571) then
 		self:TrackTrashAbility(guid, "Plague", raidFlags, name)
 	end
+	if DBM:UnitBuff(uid, 2147) then
+		self:TrackTrashAbility(guid, "Mending", raidFlags, name)
+	end
+	if DBM:UnitBuff(uid, 21737) then
+		self:TrackTrashAbility(guid, "KnockAway", raidFlags, name)
+	end
+	if DBM:UnitBuff(uid, 812) then
+		self:TrackTrashAbility(guid, "ManaBurn", raidFlags, name)
+	end
 	-- I can't find Thorns anywhere in my logs, maybe I never had it?
-	-- Also can't find Mending, but I'm sure I saw it on nameplates :/
 	-- Fire/Arcane reflect is impossible to detect like this because detect magic gets reflected (but that reflection itself is detected!)
 	-- I also don't have a log for AQ20 because no one bothers with detect magic
 end

DBM-Raids-Vanilla/AQ40/Ouro.lua

@@ -20,7 +20,8 @@ mod:RegisterCombat("combat")
 mod:RegisterEventsInCombat(
 	"SPELL_AURA_APPLIED 26615",
 	"SPELL_CAST_START 26102 26103",
-	"SPELL_CAST_SUCCESS 26058"
+	"SPELL_CAST_SUCCESS 26058",
+	"SPELL_DAMAGE 1215745"
 )
 
 local warnSubmerge		= mod:NewAnnounce("WarnSubmerge", 3, "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendBurrow.blp")
@@ -30,11 +31,13 @@ local warnBerserk		= mod:NewSpellAnnounce(26615, 3)
 local warnBerserkSoon	= mod:NewSoonAnnounce(26615, 2)
 
 local specWarnBlast		= mod:NewSpecialWarningSpell(26102, nil, nil, nil, 2, 2)
+local specWarnEye		= mod:NewSpecialWarning("SpecWarnEye", nil, nil, nil, 3, 2)
 
 local timerSubmerge		= mod:NewTimer(30, "TimerSubmerge", "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendBurrow.blp", nil, nil, 6)
 local timerEmerge		= mod:NewTimer(30, "TimerEmerge", "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendUnBurrow.blp", nil, nil, 6)
 local timerSweepCD		= mod:NewNextTimer(20.5, 26103, nil, "Tank", 2, 5, nil, DBM_COMMON_L.TANK_ICON)
 local timerBlastCD		= mod:NewNextTimer(23, 26102, nil, nil, nil, 2)
+local timerNextEye		= mod:NewNextTimer(30, 1215744)
 
 mod.vb.prewarn_enrage = false
 mod.vb.enraged = false
@@ -48,6 +51,9 @@ function mod:OnCombatStart(delay)
 	self:RegisterShortTermEvents(
 		"UNIT_HEALTH"
 	)
+	if DBM:UnitDebuff("player", 1213261) then
+		self:BlindingAdmiration(delay)
+	end
 end
 
 function mod:OnCombatEnd()
@@ -98,3 +104,17 @@ function mod:UNIT_HEALTH(uId)
 		self:UnregisterShortTermEvents()
 	end
 end
+
+function mod:BlindingAdmiration(delay)
+	if delay == 0 then delay = 0.001 end -- FIXME: remove after core fixes
+	timerNextEye:Start(-delay)
+	specWarnEye:Schedule(26 - delay)
+	specWarnEye:ScheduleVoice(26 - delay, "turnaway")
+end
+
+function mod:SPELL_DAMAGE(_, _, _, _, _, _, _, _, spellId)
+	if spellId == 1215745 and self:AntiSpam(10, "BlindingAdmiration") then
+		self:BlindingAdmiration(0)
+		specWarnEye:Play("safenow")
+	end
+end

DBM-Raids-Vanilla/localization.en.lua

@@ -142,7 +142,8 @@ L:SetGeneralLocalization{
 }
 L:SetWarningLocalization{
 	WarnSubmerge		= "Submerge",
-	WarnEmerge			= "Emerge"
+	WarnEmerge			= "Emerge",
+	SpecWarnEye			= "Look away",
 }
 L:SetTimerLocalization{
 	TimerSubmerge		= "Submerge",
@@ -152,7 +153,8 @@ L:SetOptionLocalization{
 	WarnSubmerge		= "Show warning for submerge",
 	TimerSubmerge		= "Show timer for submerge",
 	WarnEmerge			= "Show warning for emerge",
-	TimerEmerge			= "Show timer for emerge"
+	TimerEmerge			= "Show timer for emerge",
+	SpecWarnEye			= "Show warning for the giant eye"
 }
 
 ----------------

DBM-Test-Vanilla/Season of Discovery/AQ40/Reports/Ouro-Hardmode.lua

@@ -4,6 +4,7 @@ Mod:  DBM-Raids-Vanilla/Ouro
 
 Findings:
 	Unused event registration: SPELL_CAST_SUCCESS 26058 (Summon Ouro Mounds)
+	Timer for spell ID 1215744 (Blinding Admiration) is triggered by event SPELL_DAMAGE 1215745 (Blinding Admiration)
 
 Unused objects:
 	[Announce] Emerge, type=nil, spellId=<none>
@@ -22,6 +23,10 @@ Timers:
 		[  0.00] ENCOUNTER_START: 716, Ouro, 186, 40, 0
 		[ 22.62] SPELL_CAST_START: [Ouro: Sweep] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26103, Sweep, 0, 0
 			 Triggered 6x, delta times: 22.62, 30.72, 30.77, 30.71, 30.78, 30.73
+	Blinding Admiration, time=30.00, type=next, spellId=1215744, triggerDeltas = 29.61, 30.73, 30.77, 30.71, 30.79, 30.73
+		[ 29.61] SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000001B, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+			 Triggered 5x, delta times: 29.61, 30.73, 30.77, 61.50, 30.73
+		[121.82] SPELL_DAMAGE: [Curse of Madness->Pet3: Blinding Admiration] Creature-0-1-531-1-236173-000000005E, Curse of Madness, 0xa48, Pet-0-1-531-1-416-0000000003, Pet3, 0x1112, 1215745, Blinding Admiration, 0, 0
 
 Announces:
 	Sweep, type=spell, spellId=26103, triggerDeltas = 22.62, 30.72, 30.77, 30.71, 30.78, 30.73
@@ -33,6 +38,12 @@ Announces:
 		[129.41] SPELL_AURA_APPLIED: [Ouro->Ouro: Berserk] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, 26615, Berserk, 0, BUFF, 0
 
 Special warnings:
+	Look away, type=nil, spellId=<none>, triggerDeltas = 55.61, 30.73, 30.77, 30.71, 30.79
+		[ 55.61] Scheduled at 29.61 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000001B, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		[ 86.34] Scheduled at 60.34 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-0000000035, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		[117.11] Scheduled at 91.11 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000004D, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		[147.82] Scheduled at 121.82 by SPELL_DAMAGE: [Curse of Madness->Pet3: Blinding Admiration] Creature-0-1-531-1-236173-000000005E, Curse of Madness, 0xa48, Pet-0-1-531-1-416-0000000003, Pet3, 0x1112, 1215745, Blinding Admiration, 0, 0
+		[178.61] Scheduled at 152.61 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-0000000073, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
 	Sand Blast!, type=spell, spellId=26102, triggerDeltas = 24.25, 22.61, 22.67, 22.67, 24.24, 34.03, 27.49
 		[ 24.25] SPELL_CAST_START: [Ouro: Sand Blast] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26102, Sand Blast, 0, 0
 			 Triggered 7x, delta times: 24.25, 22.61, 22.67, 22.67, 24.24, 34.03, 27.49
@@ -41,17 +52,27 @@ Yells:
 	None
 
 Voice pack sounds:
+	VoicePack/safenow
+		[ 29.61] SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000001B, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+			 Triggered 5x, delta times: 29.61, 30.73, 30.77, 61.50, 30.73
+		[121.82] SPELL_DAMAGE: [Curse of Madness->Pet3: Blinding Admiration] Creature-0-1-531-1-236173-000000005E, Curse of Madness, 0xa48, Pet-0-1-531-1-416-0000000003, Pet3, 0x1112, 1215745, Blinding Admiration, 0, 0
 	VoicePack/stunsoon
 		[ 24.25] SPELL_CAST_START: [Ouro: Sand Blast] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26102, Sand Blast, 0, 0
 			 Triggered 7x, delta times: 24.25, 22.61, 22.67, 22.67, 24.24, 34.03, 27.49
+	VoicePack/turnaway
+		[ 55.61] Scheduled at 29.61 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000001B, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		[ 86.34] Scheduled at 60.34 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-0000000035, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		[117.11] Scheduled at 91.11 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000004D, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		[147.82] Scheduled at 121.82 by SPELL_DAMAGE: [Curse of Madness->Pet3: Blinding Admiration] Creature-0-1-531-1-236173-000000005E, Curse of Madness, 0xa48, Pet-0-1-531-1-416-0000000003, Pet3, 0x1112, 1215745, Blinding Admiration, 0, 0
+		[178.61] Scheduled at 152.61 by SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-0000000073, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
 
 Icons:
 	None
 
 Event trace:
 	[  0.00] ENCOUNTER_START: 716, Ouro, 186, 40, 0
 		StartCombat: ENCOUNTER_START
-		RegisterEvents: Regular, SPELL_AURA_APPLIED 26615, SPELL_CAST_START 26102 26103, SPELL_CAST_SUCCESS 26058
+		RegisterEvents: Regular, SPELL_AURA_APPLIED 26615, SPELL_CAST_START 26102 26103, SPELL_CAST_SUCCESS 26058, SPELL_DAMAGE 1215745
 		StartTimer: 22.0, Sweep
 		StartTimer: 20.0, Sand Blast
 		StartTimer: 184.0, Submerge
@@ -64,20 +85,47 @@ Event trace:
 		ShowSpecialWarning: Sand Blast!
 		PlaySound: VoicePack/stunsoon
 		StartTimer: 23.0, Sand Blast
+	[ 29.61] SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000001B, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		AntiSpam: BlindingAdmiration
+			Filtered: 12x SPELL_DAMAGE at 29.61, 29.61, 29.61, 29.63, 29.63, 29.63, 29.63, 29.63, 29.63, 29.63, 29.63, 29.63
+		StartTimer: 30.0, Blinding Admiration
+		ScheduleTask: specWarn:Schedule() at 55.61 (+26.00)
+			ShowSpecialWarning: Look away
+		ScheduleTask: specWarn:ScheduleVoice("turnaway") at 55.61 (+26.00)
+			PlaySound: VoicePack/turnaway
+		PlaySound: VoicePack/safenow
 	[ 46.86] SPELL_CAST_START: [Ouro: Sand Blast] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26102, Sand Blast, 0, 0
 		ShowSpecialWarning: Sand Blast!
 		PlaySound: VoicePack/stunsoon
 		StartTimer: 23.0, Sand Blast
 	[ 53.34] SPELL_CAST_START: [Ouro: Sweep] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26103, Sweep, 0, 0
 		ShowAnnounce: Sweep
 		StartTimer: 20.5, Sweep
+	[ 60.34] SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-0000000035, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		AntiSpam: BlindingAdmiration
+			Filtered: 13x SPELL_DAMAGE at 60.34, 60.34, 60.34, 60.34, 60.34, 60.34, 60.37, 60.37, 60.37, 60.37, 60.37, 60.37, 60.37
+		StartTimer: 30.0, Blinding Admiration
+		ScheduleTask: specWarn:Schedule() at 86.34 (+26.00)
+			ShowSpecialWarning: Look away
+		ScheduleTask: specWarn:ScheduleVoice("turnaway") at 86.34 (+26.00)
+			PlaySound: VoicePack/turnaway
+		PlaySound: VoicePack/safenow
 	[ 69.53] SPELL_CAST_START: [Ouro: Sand Blast] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26102, Sand Blast, 0, 0
 		ShowSpecialWarning: Sand Blast!
 		PlaySound: VoicePack/stunsoon
 		StartTimer: 23.0, Sand Blast
 	[ 84.11] SPELL_CAST_START: [Ouro: Sweep] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26103, Sweep, 0, 0
 		ShowAnnounce: Sweep
 		StartTimer: 20.5, Sweep
+	[ 91.11] SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-000000004D, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		AntiSpam: BlindingAdmiration
+			Filtered: 7x SPELL_DAMAGE at 91.11, 91.11, 91.11, 91.11, 91.11, 91.12, 91.12
+		StartTimer: 30.0, Blinding Admiration
+		ScheduleTask: specWarn:Schedule() at 117.11 (+26.00)
+			ShowSpecialWarning: Look away
+		ScheduleTask: specWarn:ScheduleVoice("turnaway") at 117.11 (+26.00)
+			PlaySound: VoicePack/turnaway
+		PlaySound: VoicePack/safenow
 	[ 92.20] SPELL_CAST_START: [Ouro: Sand Blast] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26102, Sand Blast, 0, 0
 		ShowSpecialWarning: Sand Blast!
 		PlaySound: VoicePack/stunsoon
@@ -89,6 +137,15 @@ Event trace:
 		ShowSpecialWarning: Sand Blast!
 		PlaySound: VoicePack/stunsoon
 		StartTimer: 23.0, Sand Blast
+	[121.82] SPELL_DAMAGE: [Curse of Madness->Pet3: Blinding Admiration] Creature-0-1-531-1-236173-000000005E, Curse of Madness, 0xa48, Pet-0-1-531-1-416-0000000003, Pet3, 0x1112, 1215745, Blinding Admiration, 0, 0
+		AntiSpam: BlindingAdmiration
+			Filtered: 8x SPELL_DAMAGE at 121.82, 121.82, 121.82, 121.83, 121.84, 121.84, 121.84, 121.84
+		StartTimer: 30.0, Blinding Admiration
+		ScheduleTask: specWarn:Schedule() at 147.82 (+26.00)
+			ShowSpecialWarning: Look away
+		ScheduleTask: specWarn:ScheduleVoice("turnaway") at 147.82 (+26.00)
+			PlaySound: VoicePack/turnaway
+		PlaySound: VoicePack/safenow
 	[129.41] SPELL_AURA_APPLIED: [Ouro->Ouro: Berserk] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, 26615, Berserk, 0, BUFF, 0
 		ShowAnnounce: Berserk
 		StopTimer: TimerSubmerge
@@ -99,6 +156,15 @@ Event trace:
 		ShowSpecialWarning: Sand Blast!
 		PlaySound: VoicePack/stunsoon
 		StartTimer: 23.0, Sand Blast
+	[152.61] SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-0000000073, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		AntiSpam: BlindingAdmiration
+			Filtered: 3x SPELL_DAMAGE at 152.62, 152.62, 152.62
+		StartTimer: 30.0, Blinding Admiration
+		ScheduleTask: specWarn:Schedule() at 178.61 (+26.00)
+			ShowSpecialWarning: Look away
+		ScheduleTask: specWarn:ScheduleVoice("turnaway") at 178.61 (+26.00)
+			PlaySound: VoicePack/turnaway
+		PlaySound: VoicePack/safenow
 	[176.33] SPELL_CAST_START: [Ouro: Sweep] Creature-0-1-531-1-15517-0000000005, Ouro, 0xa48, "", nil, 0x0, 26103, Sweep, 0, 0
 		ShowAnnounce: Sweep
 		StartTimer: 20.5, Sweep
@@ -110,7 +176,18 @@ Event trace:
 		ShowSpecialWarning: Sand Blast!
 		PlaySound: VoicePack/stunsoon
 		StartTimer: 23.0, Sand Blast
+	[183.34] SPELL_DAMAGE: [Curse of Madness: Blinding Admiration] Creature-0-1-531-1-236173-0000000088, Curse of Madness, 0xa48, "", nil, 0x0, 1215745, Blinding Admiration, 0, 0
+		AntiSpam: BlindingAdmiration
+			Filtered: 2x SPELL_DAMAGE at 183.34, 183.34
+		StartTimer: 30.0, Blinding Admiration
+		ScheduleTask: specWarn:Schedule() at 209.34 (+26.00)
+			Unscheduled by ENCOUNTER_END at 194.84
+		ScheduleTask: specWarn:ScheduleVoice("turnaway") at 209.34 (+26.00)
+			Unscheduled by ENCOUNTER_END at 194.84
+		PlaySound: VoicePack/safenow
 	[194.84] ENCOUNTER_END: 716, Ouro, 186, 40, 1, 0
 		EndCombat: ENCOUNTER_END
+		UnscheduleTask: specWarn:ScheduleVoice("turnaway") scheduled by ScheduleTask at 183.34
+		UnscheduleTask: specWarn:Schedule() scheduled by ScheduleTask at 183.34
 		AntiSpam: 716
 ]]