Bastion/TwilightAscendants: Cleanup link implementation

BigWigsMods · Jul 28, 2024 · 02db5fe · 02db5fe
1 parent 69e821e
commit 02db5fe
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 38 deletions.
diff --git a/Bastion/Locales/deDE.lua b/Bastion/Locales/deDE.lua
@@ -89,8 +89,5 @@ if L then
 	L.thundershock_quake_spam = "%s in %d"
 
 	L.last_phase_trigger = "Beeindruckende Leistung…" -- what the heck Blizz??
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
diff --git a/Bastion/Locales/esES.lua b/Bastion/Locales/esES.lua
@@ -87,8 +87,5 @@ if L then
 	L.thundershock_quake_spam = "%s en %d"
 
 	L.last_phase_trigger = "Una exhibición impresionante..."
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
diff --git a/Bastion/Locales/esMX.lua b/Bastion/Locales/esMX.lua
@@ -87,8 +87,5 @@ if L then
 	L.thundershock_quake_spam = "%s en %d"
 
 	L.last_phase_trigger = "Una exhibición impresionante..."
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
diff --git a/Bastion/Locales/frFR.lua b/Bastion/Locales/frFR.lua
@@ -89,8 +89,5 @@ if L then
 	L.thundershock_quake_spam = "%s dans %d"
 
 	L.last_phase_trigger = "Quelle démonstration impressionnante" -- "CONTEMPLEZ VOTRE DESTIN !" -- à vérifier
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
diff --git a/Bastion/Locales/itIT.lua b/Bastion/Locales/itIT.lua
@@ -89,8 +89,5 @@ if L then
 	L.thundershock_quake_spam = "%s in %d"
 
 	L.last_phase_trigger = "Ecco la vostra rovina..."
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
diff --git a/Bastion/Locales/koKR.lua b/Bastion/Locales/koKR.lua
@@ -89,8 +89,4 @@ if L then
 	L.thundershock_quake_spam = "%2$d초 후 %1$s"
 
 	L.last_phase_trigger = "꽤나 인상적이었다만..."
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
-
diff --git a/Bastion/Locales/ptBR.lua b/Bastion/Locales/ptBR.lua
@@ -87,8 +87,4 @@ if L then
 	L.thundershock_quake_spam = "%s em %d"
 
 	L.last_phase_trigger = "Que apresentação incrível..."
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
-
diff --git a/Bastion/Locales/ruRU.lua b/Bastion/Locales/ruRU.lua
@@ -72,9 +72,6 @@ if L then
 	L.thundershock_quake_spam = "%s через %d"
 
 	L.last_phase_trigger = "Ваше упорство..."
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
 L = BigWigs:NewBossLocale("Sinestra", "ruRU")

diff --git a/Bastion/Locales/zhCN.lua b/Bastion/Locales/zhCN.lua
@@ -89,8 +89,5 @@ if L then
 	L.thundershock_quake_spam = ">%s< %d！"
 
 	L.last_phase_trigger = "令人印象深刻……"
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
diff --git a/Bastion/Locales/zhTW.lua b/Bastion/Locales/zhTW.lua
@@ -89,8 +89,5 @@ if L then
 	L.thundershock_quake_spam = ">%s< %d！"
 
 	L.last_phase_trigger = "令人印象深刻的表現..."
-
-	--L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	--L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
 end
 
diff --git a/Bastion/TwilightAscendants.lua b/Bastion/TwilightAscendants.lua
@@ -47,9 +47,9 @@ if L then
 
 	L.last_phase_trigger = "An impressive display..."
 
-	L.custom_on_linked_spam = "Repeating 'Linked' say messages"
-	L.custom_on_linked_spam_icon = "Interface\\AddOns\\BigWigs\\Media\\Icons\\Menus\\Say"
-	L.custom_on_linked_spam_desc = "Repeating say messages in chat stating who you are linked with."
+	L.custom_on_linked_spam = CL.link_say_option_name
+	L.custom_on_linked_spam_desc = CL.link_say_option_desc
+	L.custom_on_linked_spam_icon = mod:GetMenuIcon("SAY")
 end
 
 --------------------------------------------------------------------------------
@@ -180,7 +180,7 @@ do
 	local function RepeatLinkSay()
 		if not mod:IsEngaged() or not mySaySpamTarget then return end
 		mod:SimpleTimer(RepeatLinkSay, 1.5)
-		mod:Say(false, CL.link_with_rticon:format(mySaySpamTarget[1], mySaySpamTarget[2]), true, ("Linked with {rt%d}%s"):format(mySaySpamTarget[1], mySaySpamTarget[2]))
+		mod:Say(false, CL.link_with_rticon:format(mySaySpamTarget[1], mySaySpamTarget[2]), true, ("{rt%d}Linked with %s"):format(mySaySpamTarget[1], mySaySpamTarget[2]))
 	end
 	function mod:StaticOverload(args)
 		staticOverloadTarget = args.destName
@@ -212,7 +212,7 @@ do
 		if self:Me(args.destGUID) then
 			gravityCoreOnMe = true
 			if staticOverloadTarget and self:GetOption("custom_on_linked_spam") then
-				mySaySpamTarget = {4, self:Ambiguate(staticOverloadTarget, "short")}
+				mySaySpamTarget = {5, 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,7 +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
-				mySaySpamTarget = {5, self:Ambiguate(args.destName, "short")}
+				mySaySpamTarget = {4, self:Ambiguate(args.destName, "short")}
 				RepeatLinkSay()
 			end
 		end