From 69e821e6ef00cb0feb0ca1080d9735cfe9aa239a Mon Sep 17 00:00:00 2001
From: funkydude <funkydude@users.noreply.github.com>
Date: Mon, 22 Jul 2024 16:20:01 +0100
Subject: [PATCH] Updates and cleanups for classic

---
 Bastion/TwilightAscendants.lua | 8 ++++----
 Blackwing/Magmaw.lua           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Bastion/TwilightAscendants.lua b/Bastion/TwilightAscendants.lua
index 6e3cf97..3b4bb2a 100644
--- a/Bastion/TwilightAscendants.lua
+++ b/Bastion/TwilightAscendants.lua
@@ -199,6 +199,7 @@ do
 		if self:Me(args.destGUID) then
 			staticOverloadOnMe = false
 			mySaySpamTarget = nil
+			self:Say(args.spellId, CL.link_removed, nil, "Link removed")
 		end
 		self:CustomIcon(staticOverloadMarker, args.destName)
 	end
@@ -211,8 +212,7 @@ do
 		if self:Me(args.destGUID) then
 			gravityCoreOnMe = true
 			if staticOverloadTarget and self:GetOption("custom_on_linked_spam") then
-				local targetName = gsub(staticOverloadTarget, "%-.+", "")
-				mySaySpamTarget = {4, targetName}
+				mySaySpamTarget = {4, self:Ambiguate(staticOverloadTarget, "short")}
 				self:SimpleTimer(RepeatLinkSay, 1.5)
 			end
 			self:Say(args.spellId, CL.count_rticon:format(CL.link, 2, 5), nil, "Link (2{rt5})")
@@ -222,8 +222,7 @@ do
 				self:Message(args.spellId, "yellow", CL.link_both_icon:format(4, self:ColorName(staticOverloadTarget), 5, self:ColorName(args.destName)))
 			end
 			if staticOverloadOnMe and self:GetOption("custom_on_linked_spam") then
-				local targetName = gsub(args.destName, "%-.+", "")
-				mySaySpamTarget = {5, targetName}
+				mySaySpamTarget = {5, self:Ambiguate(args.destName, "short")}
 				RepeatLinkSay()
 			end
 		end
@@ -233,6 +232,7 @@ do
 		if self:Me(args.destGUID) then
 			gravityCoreOnMe = false
 			mySaySpamTarget = nil
+			self:Say(args.spellId, CL.link_removed, nil, "Link removed")
 		end
 		self:CustomIcon(gravityCoreMarker, args.destName)
 	end
diff --git a/Blackwing/Magmaw.lua b/Blackwing/Magmaw.lua
index 898d75c..af81913 100644
--- a/Blackwing/Magmaw.lua
+++ b/Blackwing/Magmaw.lua
@@ -220,7 +220,7 @@ do
 	function mod:MangleRemoved(args)
 		mangleCount = mangleCount + 1
 		self:StopBar(args.spellName, args.destName)
-		self:CDBar(args.spellId, prevMangle > 0 and (95 - (args.time-prevMangle)) or 95, CL.count:format(args.spellName, mangleCount)) -- Show the bar after it ends on the tank
+		self:CDBar(args.spellId, prevMangle > 0 and (95 - (args.time-prevMangle)) or 65, CL.count:format(args.spellName, mangleCount)) -- Show the bar after it ends on the tank
 	end
 end