Added touch of the abyss and shockwave warnings to Vison of Org trash…

… mobs, since they are both particularlly annoying stuns of not dodged or interrupted.

Increased quills throttle by 1 second

DBM-Challenges/BfA/NzothVisionOrgrimmar.lua

@@ -11,7 +11,7 @@ mod:RegisterEvents(
 	"ZONE_CHANGED_NEW_AREA"
 )
 mod:RegisterEventsInCombat(
-	"SPELL_CAST_START 297822 297746 304976 297574 304251 306726 299110 307863 300351 300388 304101 304282 306001 306199 303589 305875 306828 306617 300388 296537 305378",
+	"SPELL_CAST_START 297822 297746 304976 297574 304251 306726 299110 307863 300351 300388 304101 304282 306001 306199 303589 305875 306828 306617 300388 296537 305378 298630 298033",
 	"SPELL_AURA_APPLIED 311390 315385 316481 311641 299055",
 	"SPELL_AURA_APPLIED_DOSE 311390",
 	"SPELL_CAST_SUCCESS 297237",
@@ -34,6 +34,7 @@ local warnDarkForce					= mod:NewTargetNoFilterAnnounce(299055, 3)
 local warnExplosiveLeap				= mod:NewCastAnnounce(306001, 3)
 local warnVisceralFluid				= mod:NewCastAnnounce(305875, 3)
 local warnEndlessHungerTotem		= mod:NewSpellAnnounce(297237, 4)
+local warnTouchoftheAbyss			= mod:NewCastAnnounce(298033, 4)
 
 --General (GTFOs and Affixes)
 local specWarnGTFO					= mod:NewSpecialWarningGTFO(303594, nil, nil, nil, 1, 8)
@@ -54,7 +55,7 @@ local specWarnDefiledGround			= mod:NewSpecialWarningDodge(306726, nil, nil, nil
 --Other notable abilities by mini bosses/trash
 local specWarnOrbofAnnihilation		= mod:NewSpecialWarningDodge(299110, nil, nil, nil, 2, 2)
 local specWarnDarkForce				= mod:NewSpecialWarningYou(299055, nil, nil, nil, 1, 2)
-local specWarnVoidTorrent			= mod:NewSpecialWarningDodge(307863, nil, nil, nil, 2, 8)
+local specWarnVoidTorrent			= mod:NewSpecialWarningSpell(307863, nil, nil, nil, 2, 2)--Can really only be avoided by really fast running away, most can't avoid it
 local specWarnSurgingFist			= mod:NewSpecialWarningDodge(300351, nil, nil, nil, 2, 2)
 local specWarnDecimator				= mod:NewSpecialWarningDodge(300412, nil, nil, nil, 2, 2)
 local specWarnDesperateRetching		= mod:NewSpecialWarningYou(304165, nil, nil, nil, 1, 2)
@@ -68,6 +69,8 @@ local specWarnDefiledGround			= mod:NewSpecialWarningDodge(306828, nil, nil, nil
 local specWarnRingofChaos			= mod:NewSpecialWarningDodge(306617, nil, nil, nil, 2, 2)
 local specWarnHorrifyingShout		= mod:NewSpecialWarningInterrupt(305378, "HasInterrupt", nil, nil, 1, 2)
 local specWarnMentalAssault			= mod:NewSpecialWarningInterrupt(296537, "HasInterrupt", nil, nil, 1, 2)
+local specWarnTouchoftheAbyss		= mod:NewSpecialWarningInterrupt(298033, "HasInterrupt", nil, nil, 1, 2)
+local specWarnShockwave				= mod:NewSpecialWarningDodge(298630, nil, nil, nil, 2, 2)
 
 --Thrall
 local timerSurgingDarknessCD	= mod:NewCDTimer(23.1, 297822, nil, nil, nil, 3)
@@ -125,7 +128,7 @@ function mod:SPELL_CAST_START(args)
 	elseif spellId == 297574 then
 		specWarnHopelessness:Show(DBM_CORE_ORB)
 		specWarnHopelessness:Play("orbrun")--Technically not quite accurate but closest match to "find orb"
-	elseif spellId == 304251 and self:AntiSpam(3, 1) then--Two boars, 3 second throttle
+	elseif spellId == 304251 and self:AntiSpam(4, 1) then--Two boars, 3 second throttle
 		warnVoidQuills:Show()
 	elseif spellId == 306726 then
 		specWarnDefiledGround:Show()
@@ -143,7 +146,7 @@ function mod:SPELL_CAST_START(args)
 		specWarnOrbofAnnihilation:Play("watchorb")
 	elseif spellId == 307863 then
 		specWarnVoidTorrent:Show()
-		specWarnVoidTorrent:Play("behindmob")
+		specWarnVoidTorrent:Play("specialsoon")
 	elseif spellId == 300351 then
 		specWarnSurgingFist:Show()
 		specWarnSurgingFist:Play("chargemove")
@@ -178,6 +181,16 @@ function mod:SPELL_CAST_START(args)
 	elseif spellId == 305378 and self:CheckInterruptFilter(args.sourceGUID, false, true) then
 		specWarnHorrifyingShout:Show(args.sourceName)
 		specWarnHorrifyingShout:Play("kickcast")
+	elseif spellId == 298033 then
+		if self:CheckInterruptFilter(args.sourceGUID, false, true) then
+			specWarnTouchoftheAbyss:Show(args.sourceName)
+			specWarnTouchoftheAbyss:Play("kickcast")
+		else
+			warnTouchoftheAbyss:Show()
+		end
+	elseif spellId == 298630 and self:AntiSpam(3, 3) then
+		specWarnShockwave:Show()
+		specWarnShockwave:Play("shockwave")
 	end
 end
 

DBM-Challenges/BfA/NzothVisionStormwind.lua

@@ -72,8 +72,8 @@ local timerDarkenedSkyCD		= mod:NewCDTimer(13.3, 308278, nil, nil, nil, 3)
 local timerVoidEruptionCD		= mod:NewCDTimer(27.9, 309819, nil, nil, nil, 2)
 --Extra Abilities (used by Alleria and the area LTs)
 local timerTaintedPolymorphCD	= mod:NewAITimer(21, 309648, nil, nil, nil, 3, nil, DBM_CORE_MAGIC_ICON)
-local timerExplosiveOrdnanceCD	= mod:NewCDTimer(20.7, 305672, nil, nil, nil, 3)--20-25 (on alleria anyways, forgot to log other guy)
-local timerChainsofServitudeCD	= mod:NewAITimer(21, 298691, nil, nil, nil, 2)
+--local timerExplosiveOrdnanceCD	= mod:NewCDTimer(20.7, 305672, nil, nil, nil, 3)--20-25 (on alleria anyways, forgot to log other guy)
+local timerChainsofServitudeCD	= mod:NewCDTimer(32.9, 298691, nil, nil, nil, 2)
 
 mod:AddInfoFrameOption(307831, true)
 
@@ -117,7 +117,8 @@ function mod:SPELL_CAST_START(args)
 	elseif spellId == 298691 then
 		specWarnChainsofServitude:Show()
 		specWarnChainsofServitude:Play("justrun")
-		timerChainsofServitudeCD:Start()
+		local cid = args:GetSrcCreatureID()
+		timerChainsofServitudeCD:Start(cid == 152718 and 32.9 or 20.8)
 	elseif spellId == 308669 and self:AntiSpam(5, 4) then
 		specWarnDarkGaze:Show(args.sourceName)
 		specWarnDarkGaze:Play("turnaway")
@@ -212,12 +213,12 @@ function mod:UNIT_DIED(args)
 		timerDarkenedSkyCD:Stop()
 		timerVoidEruptionCD:Stop()
 		timerTaintedPolymorphCD:Stop()
-		timerExplosiveOrdnanceCD:Stop()
+		--timerExplosiveOrdnanceCD:Stop()
 		timerChainsofServitudeCD:Stop()
 		DBM:EndCombat(self)
 		started = false
 	elseif cid == 156577 then--Therum Deepforge
-		timerExplosiveOrdnanceCD:Stop()
+		--timerExplosiveOrdnanceCD:Stop()
 		self.vb.TherumCleared = true
 	elseif cid == 153541 then--slavemaster-ulrok
 		timerChainsofServitudeCD:Stop()
@@ -246,10 +247,10 @@ function mod:ENCOUNTER_START(encounterID)
 		timerDarkenedSkyCD:Start(4.9)
 		timerVoidEruptionCD:Start(20.5)
 		if self.vb.TherumCleared then
-			timerExplosiveOrdnanceCD:Start(9.7)
+			--timerExplosiveOrdnanceCD:Start(9.7)
 		end
 		if self.vb.UlrokCleared then
-			timerChainsofServitudeCD:Start(1)
+			timerChainsofServitudeCD:Start(11)
 		end
 		if self.vb.UmbricCleared then
 			timerTaintedPolymorphCD:Start(1)
@@ -258,15 +259,15 @@ function mod:ENCOUNTER_START(encounterID)
 end
 
 function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
-	if spellId == 312260 and self:AntiSpam(3, 1) then--Explosive Ordnance (not in combat log)
+	if (spellId == 305708 or spellId == 312260) and self:AntiSpam(3, 1) then--Explosive Ordnance (not in combat log)
 		self:SendSync("ExplosiveOrd")
 	end
 end
 
-function mod:OnSync(msg)
+function mod:OnSync(msg, cid)
 	if not self:IsInCombat() then return end
-	if msg == "ExplosiveOrd" then
+	if cid and msg == "ExplosiveOrd" then
 		warnExplosiveOrdnance:Show()
-		timerExplosiveOrdnanceCD:Start()
+		--timerExplosiveOrdnanceCD:Start(cid == 156577 and 11.3 or 30.5)
 	end
 end