5.20 (#5)

Co-authored-by: Szyler <Szyler@Szyler.com>

DBM-BlackTemple/Naj'entus.lua

@@ -13,8 +13,11 @@ mod:RegisterEvents(
 
 local warningShield			= mod:NewSpellAnnounce(2142521, 3)
 local warningDischarge		= mod:NewSpellAnnounce(2142504, 3)
+local specWarnYouDischarge	= mod:NewSpecialWarningYou(2142504)
 local warningPuddle			= mod:NewSpellAnnounce(2142594, 3)
 local warnSpine				= mod:NewTargetAnnounce(2142516, 2)
+local warnOozeDot			= mod:NewSpellAnnounce(2142564, 2)
+local specWarnDampFeet		= mod:NewSpecialWarning("Move out of the water!", 2142550)
 
 local warnPhase2			= mod:NewPhaseAnnounce(2)
 
@@ -29,12 +32,15 @@ local yellDischarge			= mod:NewFadesYell(2142504)
 
 mod:AddBoolOption(L.SpineYellOpt)
 mod:AddBoolOption(L.DischargeYellOpt)
+mod:AddBoolOption(L.SpineIconsOpt)
+mod:AddBoolOption(L.RangeCheck)
 
+local spineWreathIcon = 8
 
 function mod:OnCombatStart(delay)
 	self:ScheduleMethod(0-delay, "NewAdds")
-	timerNextSpine:Start(50-delay)
-	timerNextShield:Start(35-delay)
+	timerNextDischarge:Start(10-delay)
+	spineWreathIcon = 8
 end
 
 function mod:OnCombatEnd()
@@ -51,25 +57,45 @@ function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(2142521) then
 		warningShield:Show()
 		timerNextShield:Start()
-	elseif args:IsSpellID(2142504) then-- This is the damage proc, not the aura. args:IsSpellID(2142505, 2142506, 2142507, 2142508) then
-		warningDischarge:Show()
-		timerNextDischarge:Start()
-		if args:IsPlayer() and self.Options.DischargeYellOpt then
-			yellDischarge:Schedule(8, 5)
+		timerNextSpine:Start(10)
+	elseif args:IsSpellID(2142504) then
+		if args:IsPlayer() then
+			if self.Options.DischargeYellOpt then
+				SendChatMessage(L.SayDischargeFade, "SAY")
+				yellDischarge:Countdown(8, 5)
+			end
+			specWarnYouDischarge:Show()
+			if self.Options.RangeCheck then
+				DBM.RangeCheck:Show(15)
+			end
+		end
+		if DBM:AntiSpam() then
+			warningDischarge:Show()
+			timerNextDischarge:Start()
 		end
 	elseif args:IsSpellID(2142516, 2142517, 2142518, 2142519) then
-		warnSpine:Show()
+		warnSpine:Show(args.destName)
 		timerNextSpine:Start()
 		timerTargetSpine:Start(args.destName)
+		if self.Options.SpineIconsOpt then
+			self:SetIcon(args.destName, spineWreathIcon, 20)
+			spineWreathIcon = spineWreathIcon - 1
+		end
 	elseif args:IsSpellID(2142526) then
 		warnPhase2:Show()
+		timerNextShield:Stop()
+		timerNextSpine:Stop()
 	elseif args:IsSpellID(2142594,2142595,2142596,2142597) or args:IsSpellID(2142560, 21425601,2142562,2142563) then
 		if args:IsPlayer() then
 			warningPuddle:Show()
 		end
-	elseif args:IsSpellID() then
+	elseif args:IsSpellID(2142564, 2142565, 2142566, 2142567) then
 		if args:IsPlayer() then
-			warningPuddle:Show()
+			warnOozeDot:Show()
+		end
+	elseif args:IsSpellID(2142550, 2142551) then
+		if args:IsPlayer() then
+			specWarnDampFeet:Show()
 		end
 	end
 end
@@ -77,12 +103,21 @@ end
 function mod:SPELL_AURA_REMOVED(args)
 	if args:IsSpellID(2142516, 2142517, 2142518, 2142519) then
 		timerTargetSpine:Stop()
+		if self.Options.SpineIconsOpt then
+			spineWreathIcon = spineWreathIcon + 1
+		end
+	elseif args:IsSpellID(2142504) then
+		if args:IsPlayer() then
+			if self.Options.RangeCheck then
+				DBM.RangeCheck:Hide()
+			end
+		end
 	end
 end
 
 function mod:SPELL_PERIODIC_DAMAGE(args)
-	if self.Options.SpineYellOpt and args:IsPlayer() then
-		if args:IsSpellID(2142516, 2142517, 2142518, 2142519) then
+	if args:IsSpellID(2142516, 2142517, 2142518, 2142519) then
+		if self.Options.SpineYellOpt and args:IsPlayer() then
 			SendChatMessage(L.SpineYell, "YELL")
 		end
 	end