Cleanups

CastleNathria/Altimor.lua

@@ -165,7 +165,7 @@ do
 		playerList[count] = args.destName
 		playerList[args.destName] = count -- Set raid marker
 		if self:Me(args.destGUID) then
-			self:Say(335114, CL.count_rticon:format(self:SpellName(335114), count, count))
+			self:Say(335114, CL.count_rticon:format(self:SpellName(335114), count, count), nil, CL.count_rticon:format("Sinseeker", count, count))
 			self:SayCountdown(335114, 5.7, count) -- _applied to damage, varys with distance
 			self:PlaySound(335114, "warning")
 			self:Flash(335114)
@@ -211,7 +211,7 @@ function mod:ViciousLungeApplied(args)
 	if self:Me(args.destGUID) then
 		lungeTarget = 2
 		self:PlaySound(args.spellId, "warning")
-		self:Yell(args.spellId)
+		self:Yell(args.spellId, nil, nil, "Vicious Lunge")
 		self:YellCountdown(args.spellId, 6)
 	else
 		lungeTarget = 1
@@ -346,7 +346,7 @@ do
 		playerList[#playerList+1] = args.destName
 		if self:Me(args.destGUID) then
 			self:PlaySound(args.spellId, "warning")
-			self:Say(args.spellId)
+			self:Say(args.spellId, nil, nil, "Petrifying Howl")
 			self:SayCountdown(args.spellId, 8)
 			self:Flash(args.spellId)
 			self:TargetBar(args.spellId, 8, args.destName)

CastleNathria/Denathrius.lua

@@ -507,7 +507,7 @@ do
 		end
 		if self:Me(args.destGUID)then
 			self:PersonalMessage(args.spellId)
-			self:Say(args.spellId)
+			self:Say(args.spellId, nil, nil, "Feeding Time")
 			self:SayCountdown(args.spellId, 5)
 			self:PlaySound(args.spellId, "warning")
 		end
@@ -538,7 +538,7 @@ do
 		playerList[count] = args.destName
 		playerList[args.destName] = count -- Set raid marker
 		if self:Me(args.destGUID)then
-			self:Yell(args.spellId, CL.count_rticon:format(args.spellName, count, count))
+			self:Yell(args.spellId, CL.count_rticon:format(args.spellName, count, count), nil, CL.count_rticon:format("Night Hunter", count, count))
 			if self:GetOption("custom_on_repeating_nighthunter") then
 				local text = ("{rt%d}{rt%d}{rt%d}"):format(count, count, count)
 				self:YellCountdown(false, 6, text, 4)
@@ -639,7 +639,7 @@ do
 		playerList[count] = args.destName
 		playerList[args.destName] = count -- Set raid marker
 		if self:Me(args.destGUID)then
-			self:Say(args.spellId, CL.count:format(args.spellName, count))
+			self:Say(args.spellId, CL.count:format(args.spellName, count), nil, CL.count:format("Impale", count))
 			if self:GetOption("custom_on_repeating_impale") then
 				local msg = sayMessages[count]
 				sayTimer = self:ScheduleRepeatingTimer("Say", 1.5, false, msg, true)
@@ -784,7 +784,7 @@ do
 		playerList[count] = args.destName
 		playerList[args.destName] = count
 		if self:Me(args.destGUID)then
-			self:Say(args.spellId, CL.count_rticon:format(args.spellName, count, count))
+			self:Say(args.spellId, CL.count_rticon:format(args.spellName, count, count), nil, CL.count_rticon:format("Fatal Finesse", count, count))
 			self:SayCountdown(args.spellId, 5, count)
 			self:PlaySound(args.spellId, "warning")
 		end

CastleNathria/HungeringDestroyer.lua

@@ -159,7 +159,7 @@ end
 local function RepeatingChatMessages()
 	local duration = 1.5
 	if volEjectionOnMe and mod:GetOption("custom_on_repeating_say_laser") then
-		mod:Say(false, CL.beam)
+		mod:Say(false, CL.beam, nil, "Beam")
 	elseif miasmaOnMe and mod:GetOption("custom_on_repeating_yell_miasma") then -- Repeat Health instead
 		local currentHealthPercent = math.floor(mod:GetHealth("player"))
 		if currentHealthPercent < 75 then -- Only let players know when you are below 75%
@@ -224,13 +224,13 @@ do
 				miasmaOnMe = true
 				self:PlaySound(args.spellId, "alarm")
 				if not self:LFR() then
-					self:Yell(args.spellId, CL.count_rticon:format(L.miasma, count, count))
+					self:Yell(args.spellId, CL.count_rticon:format(L.miasma, count, count), nil, CL.count_rticon:format("Miasma", count, count))
 					if not scheduledChatMsg and self:GetOption("custom_on_repeating_yell_miasma") then
 						scheduledChatMsg = true
 						self:SimpleTimer(RepeatingChatMessages, 2)
 					end
 				else
-					self:Yell(args.spellId, L.miasma)
+					self:Yell(args.spellId, L.miasma, nil, "Miasma")
 				end
 			end
 
@@ -295,7 +295,7 @@ do
 		if self:Me(args.destGUID) then
 			self:PlaySound(334266, "warning")
 			self:Flash(334266)
-			self:Say(334266, CL.beam)
+			self:Say(334266, CL.beam, nil, "Beam")
 			volEjectionOnMe = true
 			if not scheduledChatMsg and not self:LFR() and self:GetOption("custom_on_repeating_say_laser") then
 				scheduledChatMsg = true

CastleNathria/InervaDarkvein.lua

@@ -306,7 +306,7 @@ end
 
 function mod:ChangeOfHeartApplied(args)
 	if self:Me(args.destGUID) then
-		self:Say(args.spellId, CL.bomb)
+		self:Say(args.spellId, CL.bomb, nil, "Bomb")
 		self:SayCountdown(args.spellId, 4)
 		self:PlaySound(args.spellId, "warning")
 	end
@@ -337,7 +337,7 @@ do
 		end
 
 		if self:Me(args.destGUID) then
-			self:Say(324983, L.sins)
+			self:Say(324983, L.sins, nil, "Sins")
 			self:PlaySound(324983, "warning")
 		end
 
@@ -380,7 +380,7 @@ do
 		if self:Me(args.destGUID) then
 			isOnMe = true
 			self:PlaySound(332664, "alarm")
-			self:Say(332664, CL.rticon:format(args.spellId == 340477 and CL.big_add or CL.small_add, icon))
+			self:Say(332664, CL.rticon:format(args.spellId == 340477 and CL.big_add or CL.small_add, icon), nil, CL.rticon:format(args.spellId == 340477 and "Big Add" or "Small Add", icon))
 			self:SayCountdown(332664, 10, icon)
 			self:OpenProximity(332664, 8)
 		end

CastleNathria/Shriekwing.lua

@@ -160,7 +160,7 @@ do
 
 		playerList[#playerList+1] = args.destName
 		if self:Me(args.destGUID) then
-			self:Say(342074)
+			self:Say(342074, nil, nil, "Echolocation")
 			self:SayCountdown(342074, self:Mythic() and 6 or 8)
 			self:PlaySound(342074, "warning")
 		end

CastleNathria/Sludgefist.lua

@@ -14,7 +14,7 @@ mod:SetRespawnTime(30)
 local destructiveStompCount = 1
 local colossalRoarCount = 1
 local chainLinkCount = 1
-local hatefullGazeCount = 1
+local hatefulGazeCount = 1
 local chainSlamCount = 1
 local seismicShiftCount = 1
 local chainLinksApplied = 0
@@ -95,7 +95,7 @@ function mod:OnEngage()
 	destructiveStompCount = 1
 	colossalRoarCount = 1
 	chainLinkCount = 1
-	hatefullGazeCount = 1
+	hatefulGazeCount = 1
 	chainSlamCount = 1
 	seismicShiftCount = 1
 	chainLinksApplied = 0
@@ -107,9 +107,9 @@ function mod:OnEngage()
 		self:Bar(335470, 29.1, CL.count:format(self:SpellName(335470), chainSlamCount)) -- Chain Slam
 	end
 	if self:Tank() then
-		self:Bar(331209, 52.5, CL.count:format(self:SpellName(331209), hatefullGazeCount)) -- Hateful Gaze
+		self:Bar(331209, 52.5, CL.count:format(self:SpellName(331209), hatefulGazeCount)) -- Hateful Gaze
 	else
-		self:CDBar(331314, self:Mythic() and 58.5 or 60.5, CL.count:format(self:SpellName(331314), hatefullGazeCount)) -- Destructive Impact
+		self:CDBar(331314, self:Mythic() and 58.5 or 60.5, CL.count:format(self:SpellName(331314), hatefulGazeCount)) -- Destructive Impact
 	end
 	if self:Mythic() then
 		self:CDBar(340817, timers[340817][seismicShiftCount], CL.count:format(L.stomp_shift, seismicShiftCount)) -- Seismic Shift
@@ -137,24 +137,24 @@ function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, _, spellId)
 end
 
 function mod:HatefulGazeApplied(args)
-	self:StopBar(CL.count:format(args.spellName, hatefullGazeCount))
-	self:TargetMessage(args.spellId, "yellow", args.destName, CL.count:format(args.spellName, hatefullGazeCount))
+	self:StopBar(CL.count:format(args.spellName, hatefulGazeCount))
+	self:TargetMessage(args.spellId, "yellow", args.destName, CL.count:format(args.spellName, hatefulGazeCount))
 	local duration = self:Mythic() and 4 or 6
 	if self:Me(args.destGUID) then
 		self:PlaySound(args.spellId, "warning")
-		self:Say(args.spellId)
+		self:Say(args.spellId, nil, nil, "Hateful Gaze")
 		self:SayCountdown(args.spellId, duration)
 	end
 	if self:Tank() then
-		self:TargetBar(args.spellId, duration, args.destName, CL.count:format(args.spellName, hatefullGazeCount))
+		self:TargetBar(args.spellId, duration, args.destName, CL.count:format(args.spellName, hatefulGazeCount))
 	else
-		self:CDBar(331314, duration, CL.count:format(self:SpellName(331314), hatefullGazeCount)) -- Destructive Impact
+		self:CDBar(331314, duration, CL.count:format(self:SpellName(331314), hatefulGazeCount)) -- Destructive Impact
 	end
-	hatefullGazeCount = hatefullGazeCount + 1
+	hatefulGazeCount = hatefulGazeCount + 1
 end
 
 function mod:HatefulGazeRemoved(args)
-	self:StopBar(CL.count:format(args.spellName, hatefullGazeCount-1), args.destName)
+	self:StopBar(CL.count:format(args.spellName, hatefulGazeCount-1), args.destName)
 	if self:Me(args.destGUID) then
 		self:CancelSayCountdown(args.spellId)
 	end
@@ -178,9 +178,9 @@ end
 function mod:DestructiveImpactRemoved(args)
 	chainLinksApplied = 0
 	if self:Tank() then
-		self:Bar(331209, 52.5, CL.count:format(self:SpellName(331209), hatefullGazeCount)) -- Hateful Gaze
+		self:Bar(331209, 52.5, CL.count:format(self:SpellName(331209), hatefulGazeCount)) -- Hateful Gaze
 	else
-		self:CDBar(331314, self:Mythic() and 58.5 or 60.5, CL.count:format(self:SpellName(331314), hatefullGazeCount)) -- Destructive Impact
+		self:CDBar(331314, self:Mythic() and 58.5 or 60.5, CL.count:format(self:SpellName(331314), hatefulGazeCount)) -- Destructive Impact
 	end
 
 	-- Update timers to be more exact
@@ -244,7 +244,7 @@ function mod:ChainSlamApplied(args)
 	self:TargetMessage(args.spellId, "yellow", args.destName, CL.count:format(args.spellName, chainSlamCount))
 	self:PrimaryIcon(args.spellId, args.destName)
 	if self:Me(args.destGUID) then
-		self:Yell(args.spellId)
+		self:Yell(args.spellId, nil, nil, "Chain Slam")
 		self:YellCountdown(args.spellId, 4)
 		self:PlaySound(args.spellId, "warning")
 	end

CastleNathria/StoneLegionGenerals.lua

@@ -335,7 +335,7 @@ do
 	local function printTarget(self, target, guid)
 		if #playerList ~= 0 then -- Compensate for sometimes taking a very long time (0.5s+) to pick a target by using this fallback
 			if not self:Me(guid) and onMe then
-				self:Say(333387, L.second_blade)
+				self:Say(333387, L.second_blade, nil, "Second Blade")
 				self:PlaySound(333387, "warning")
 			end
 			if self:GetOption(wickedBladeMarker) then
@@ -350,7 +350,7 @@ do
 		end
 
 		if self:Me(guid) then
-			self:Say(333387, L.first_blade)
+			self:Say(333387, L.first_blade, nil, "First Blade")
 			self:PlaySound(333387, "warning")
 		end
 	end
@@ -369,7 +369,7 @@ do
 			playerList[#playerList+1] = args.destName
 			if self:Me(args.destGUID) then
 				onMe = true
-				self:Say(333387)
+				self:Say(333387, nil, nil, "Wicked Blade")
 				self:PlaySound(333387, "warning")
 			end
 			if #playerList == 2 then
@@ -381,7 +381,7 @@ do
 			end
 		elseif firstGUID and firstGUID ~= args.destGUID then
 			if self:Me(args.destGUID) then
-				self:Say(333387, L.second_blade)
+				self:Say(333387, L.second_blade, nil, "Second Blade")
 				self:PlaySound(333387, "warning")
 			end
 			playerList[2] = args.destName
@@ -483,7 +483,7 @@ do
 		prevGUID = args.destGUID
 		self:TargetMessage(args.spellId, "yellow", args.destName, CL.count:format(args.spellName, crystalizeCount-1))
 		if self:Me(args.destGUID) then
-			self:Say(args.spellId)
+			self:Say(args.spellId, nil, nil, "Crystalize")
 			self:SayCountdown(args.spellId, 5)
 			self:PlaySound(args.spellId, "warning")
 		end
@@ -500,7 +500,7 @@ do
 
 	function mod:PulverizingMeteor(args)
 		if self:Me(prevGUID) then
-			self:Yell(args.spellId, CL.meteor) -- Meteor
+			self:Yell(args.spellId, CL.meteor, nil, "Meteor") -- Meteor
 		end
 		self:Message(args.spellId, "orange", CL.count:format(CL.meteor, pulverizingMeteorCount))
 		self:PlaySound(args.spellId, "alert")
@@ -595,7 +595,7 @@ end
 do
 	local function printTarget(self, player, guid)
 		if self:Me(guid) then
-			self:Say(344496, L.eruption) -- Eruption
+			self:Say(344496, L.eruption, nil, "Eruption") -- Eruption
 			self:PlaySound(344496, "warning")
 		end
 		self:TargetMessage(344496, "red", player, CL.count:format(L.eruption, reverberatingLeapCount-1))

CastleNathria/SunKingsSalvation.lua

@@ -375,7 +375,7 @@ end
 function mod:EmberBlastApplied(args)
 	if self:Me(args.destGUID) then
 		self:PlaySound(325877, "warning")
-		self:Yell(325877)
+		self:Yell(325877, nil, nil, "Ember Blast")
 		self:Flash(325877)
 		if self:LFR() then
 			self:YellCountdown(325877, 5)
@@ -463,17 +463,17 @@ function mod:ConcussiveSmash(args)
 end
 
 function mod:RockboundVanquisherDeath(args)
-	local count = concussiveSmashCountTable[args.sourceGUID] or 1
+	local count = concussiveSmashCountTable[args.destGUID] or 1
 	self:StopBar(CL.count:format(self:SpellName(325506), count)) -- Concussive Smash
-	concussiveSmashCountTable[args.sourceGUID] = nil
+	concussiveSmashCountTable[args.destGUID] = nil
 	self:StopBar(325440) -- Vanquishing Strike
 end
 
 function mod:CrimsonFlurryApplied(args)
 	if self:Me(args.destGUID) then
 		self:PersonalMessage(args.spellId)
 		self:PlaySound(args.spellId, "alarm")
-		self:Say(args.spellId)
+		self:Say(args.spellId, nil, nil, "Crimson Flurry")
 		self:Flash(args.spellId)
 	end
 end
@@ -527,7 +527,7 @@ do
 		proxList[#proxList+1] = args.destName
 		if self:Me(args.destGUID) then
 			isOnMe = true
-			self:Say(328889) -- Greater Castigation
+			self:Say(328889, nil, nil, "Greater Castigation") -- Greater Castigation
 			self:OpenProximity(328889, 6) -- Greater Castigation
 			self:PlaySound(328889, "alarm") -- Greater Castigation
 		end

CastleNathria/TheCouncilofBlood.lua

@@ -104,7 +104,7 @@ function mod:GetOptions()
 		--[[ Mythic ]]--
 		-22433, -- Afterimage of Baroness Frieda
 		afterImageMarker,
-		{347350, "SAY", "SAY_COUNTDOWN"}, -- Dancing Fever
+		347350, -- Dancing Fever
 	},{
 		["stages"] = "general",
 		[346690] = -22147, -- Castellan Niklaus

CastleNathria/Trash.lua

@@ -285,7 +285,7 @@ end
 function mod:GluttonousMiasma(args)
 	if self:MobId(args.sourceGUID) == 173142 then -- Dread Feaster
 		if self:Me(args.destGUID) then
-			self:Yell(args.spellId, L.miasma)
+			self:Yell(args.spellId, L.miasma, nil, "Miasma")
 		end
 		self:TargetMessage(args.spellId, "yellow", args.destName, L.miasma)
 		self:PlaySound(args.spellId, "alarm", nil, args.destName)
@@ -332,7 +332,7 @@ do
 		self:TargetBar(args.spellId, 10, args.destName)
 		if self:Me(args.destGUID) then
 			self:PlaySound(args.spellId, "alarm")
-			self:Say(args.spellId)
+			self:Say(args.spellId, nil, nil, "Concentrate Anima")
 			self:SayCountdown(args.spellId, 10)
 		end
 	end

CastleNathria/Xymox.lua

@@ -269,7 +269,7 @@ do
 		playerList[count] = args.destName
 		playerList[args.destName] = count -- Set raid marker
 		if self:Me(args.destGUID) then
-			self:Say(328437, CL.count_rticon:format(L.tear, count, count))
+			self:Say(328437, CL.count_rticon:format(L.tear, count, count), nil, CL.count_rticon:format("Tear", count, count))
 			self:SayCountdown(328437, 8)
 			self:PlaySound(328437, "warning")
 		end
@@ -305,7 +305,7 @@ function mod:GlyphOfDestructionApplied(args)
 	self:PlaySound(args.spellId, "warning")
 	self:TargetBar(args.spellId, self:Easy() and 8 or 4, args.destName, CL.bomb)
 	if self:Me(args.destGUID) then
-		self:Say(args.spellId, CL.bomb)
+		self:Say(args.spellId, CL.bomb, nil, "Bomb")
 		self:SayCountdown(args.spellId, self:Easy() and 8 or 4)
 	end
 end

SanctumOfDomination/FatescribeRohKalo.lua

@@ -203,7 +203,7 @@ end
 
 function mod:InvokeDestinyApplied(args)
 	if self:Me(args.destGUID) then
-		self:Say(args.spellId, CL.count:format(CL.add, invokeDestinyCount-1))
+		self:Say(args.spellId, CL.count:format(CL.add, invokeDestinyCount-1), nil, CL.count:format("Add", invokeDestinyCount-1))
 		self:SayCountdown(args.spellId, 8)
 		self:PlaySound(args.spellId, "warning")
 	end
@@ -298,7 +298,7 @@ do
 		playerList[args.destName] = icon -- Set raid marker
 		if self:Me(args.destGUID) then
 			self:TargetBar(350568, 8, args.destName, CL.count:format(CL.bomb, callOfEternityCount-1))
-			self:Say(350568, CL.count_rticon:format(CL.bomb, count, icon))
+			self:Say(350568, CL.count_rticon:format(CL.bomb, count, icon), nil, CL.count_rticon:format("Bomb", count, icon))
 			self:SayCountdown(350568, 8)
 			self:PlaySound(350568, "warning")
 		end

SanctumOfDomination/GuardianOfTheFirstOnes.lua

@@ -389,7 +389,7 @@ do
 		playerList[count] = args.destName
 		playerList[args.destName] = count -- Set raid marker
 		if self:Me(args.destGUID) then
-			self:Say(args.spellId, CL.bomb)
+			self:Say(args.spellId, CL.bomb, nil, "Bomb")
 			self:SayCountdown(args.spellId, 4)
 			self:PlaySound(args.spellId, "warning")
 		end