From 165c0b41a5b1f411b222476e14cc8d9e6e47a57a Mon Sep 17 00:00:00 2001
From: Nick Towle <ntowle@gmail.com>
Date: Tue, 15 Oct 2024 22:41:00 -0400
Subject: [PATCH] BfA/SiegeOfBoralus/Trash: Tweaks, localization

---
 BfA/SiegeOfBoralus/Locales/deDE.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/esES.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/frFR.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/itIT.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/koKR.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/ptBR.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/ruRU.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/zhCN.lua   |  1 +
 BfA/SiegeOfBoralus/Locales/zhTW.lua   |  1 +
 BfA/SiegeOfBoralus/Options/Colors.lua |  1 +
 BfA/SiegeOfBoralus/Options/Sounds.lua |  1 +
 BfA/SiegeOfBoralus/Trash.lua          | 60 +++++++++++++++------------
 12 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/BfA/SiegeOfBoralus/Locales/deDE.lua b/BfA/SiegeOfBoralus/Locales/deDE.lua
index d5f876918..784acd216 100644
--- a/BfA/SiegeOfBoralus/Locales/deDE.lua
+++ b/BfA/SiegeOfBoralus/Locales/deDE.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "Wellenformer der Eisenfluträuber"
 	L.wavetender = "Wellenzähmer von Kul Tiras"
 	L.raider = "Eisenfluträuber"
+	L.shredder = "Springflutschredder"
 	L.vanguard = "Vorhut von Kul Tiras"
 	L.commander = "Aschenwindkommandant"
 	L.spotter = "Aschenwindkundschafter"
diff --git a/BfA/SiegeOfBoralus/Locales/esES.lua b/BfA/SiegeOfBoralus/Locales/esES.lua
index a5ff0e27a..3bbe6e5d7 100644
--- a/BfA/SiegeOfBoralus/Locales/esES.lua
+++ b/BfA/SiegeOfBoralus/Locales/esES.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "Tallaolas Marea de Hierro"
 	L.wavetender = "Cuidaolas de Kul Tiras"
 	L.raider = "Asaltante Marea de Hierro"
+	L.shredder = "Triturador Mareaviva"
 	L.vanguard = "Vanguardia de Kul Tiras"
 	L.commander = "Comandante Gobernalle"
 	L.spotter = "Avistador de los Gobernalle"
diff --git a/BfA/SiegeOfBoralus/Locales/frFR.lua b/BfA/SiegeOfBoralus/Locales/frFR.lua
index aabd15406..095f81db8 100644
--- a/BfA/SiegeOfBoralus/Locales/frFR.lua
+++ b/BfA/SiegeOfBoralus/Locales/frFR.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "Sculpte-vagues des Lamineurs"
 	L.wavetender = "Soigne-vagues kultirassien"
 	L.raider = "Ecumeur des Lamineurs"
+	L.shredder = "Déchiqueteur des marées"
 	L.vanguard = "Avant-garde de Kul Tiras"
 	L.commander = "Commandant corsandre"
 	L.spotter = "Guetteur corsandre"
diff --git a/BfA/SiegeOfBoralus/Locales/itIT.lua b/BfA/SiegeOfBoralus/Locales/itIT.lua
index 81d1001f3..9706b02b0 100644
--- a/BfA/SiegeOfBoralus/Locales/itIT.lua
+++ b/BfA/SiegeOfBoralus/Locales/itIT.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "Plasmaonde Marferreo"
 	L.wavetender = "Tracciaonde di Kul Tiras"
 	L.raider = "Incursore Marferreo"
+	L.shredder = "Sminuzzatore Squarciamaree"
 	L.vanguard = "Avanguardia di Kul Tiras"
 	L.commander = "Comandante dei Bracescura"
 	L.spotter = "Ricognitore dei Bracescura"
diff --git a/BfA/SiegeOfBoralus/Locales/koKR.lua b/BfA/SiegeOfBoralus/Locales/koKR.lua
index 7cdf1270c..3375a700b 100644
--- a/BfA/SiegeOfBoralus/Locales/koKR.lua
+++ b/BfA/SiegeOfBoralus/Locales/koKR.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "무쇠파도 물결구체자"
 	L.wavetender = "쿨 티란 파도지기"
 	L.raider = "무쇠파도 약탈단"
+	L.shredder = "성난파도 파쇄꾼"
 	L.vanguard = "쿨 티란 선봉대원"
 	L.commander = "애쉬베인 지휘관"
 	L.spotter = "애쉬베인 관측병"
diff --git a/BfA/SiegeOfBoralus/Locales/ptBR.lua b/BfA/SiegeOfBoralus/Locales/ptBR.lua
index 42d90b3f8..1f46bad9e 100644
--- a/BfA/SiegeOfBoralus/Locales/ptBR.lua
+++ b/BfA/SiegeOfBoralus/Locales/ptBR.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "Moldaonda Maré-férrea"
 	L.wavetender = "Zelamar Kultireno"
 	L.raider = "Saqueador Maré-férrea"
+	L.shredder = "Retalhador Contracorrente"
 	L.vanguard = "Vanguarda Kultirena"
 	L.commander = "Comandante Grimpagris"
 	L.spotter = "Avistador Grimpagris"
diff --git a/BfA/SiegeOfBoralus/Locales/ruRU.lua b/BfA/SiegeOfBoralus/Locales/ruRU.lua
index 7f513eca3..e8a338269 100644
--- a/BfA/SiegeOfBoralus/Locales/ruRU.lua
+++ b/BfA/SiegeOfBoralus/Locales/ruRU.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "Заклинатель моря из братства Стальных Волнr"
 	L.wavetender = "Кул-тирасский смотритель приливов"
 	L.raider = "Налетчик из братства Стальных Волн"
+	L.shredder = "Мастер клинков прилива"
 	L.vanguard = "Кул-тирасский боец авангарда"
 	L.commander = "Командир из корпорации Эшвейнов"
 	L.spotter = "Наводчик корпорации Эшвейнов"
diff --git a/BfA/SiegeOfBoralus/Locales/zhCN.lua b/BfA/SiegeOfBoralus/Locales/zhCN.lua
index a98c28879..22d4a213d 100644
--- a/BfA/SiegeOfBoralus/Locales/zhCN.lua
+++ b/BfA/SiegeOfBoralus/Locales/zhCN.lua
@@ -7,6 +7,7 @@ if L then
 	L.waveshaper = "铁潮塑浪者"
 	L.wavetender = "库尔提拉斯护潮者"
 	L.raider = "铁潮袭击者"
+	L.shredder = "激流破浪者"
 	L.vanguard = "库尔提拉斯先锋"
 	L.commander = "艾什凡指挥官"
 	L.spotter = "艾什凡观察员"
diff --git a/BfA/SiegeOfBoralus/Locales/zhTW.lua b/BfA/SiegeOfBoralus/Locales/zhTW.lua
index cb9ff56d2..d5d11f678 100644
--- a/BfA/SiegeOfBoralus/Locales/zhTW.lua
+++ b/BfA/SiegeOfBoralus/Locales/zhTW.lua
@@ -7,6 +7,7 @@ if L then
 	--L.waveshaper = "Irontide Waveshaper"
 	L.wavetender = "庫爾提拉斯平浪者"
 	L.raider = "鐵潮劫掠者"
+	--L.shredder = "Riptide Shredder"
 	L.vanguard = "庫爾提拉斯先鋒"
 	L.commander = "艾胥凡指揮官"
 	L.spotter = "艾胥凡偵察兵"
diff --git a/BfA/SiegeOfBoralus/Options/Colors.lua b/BfA/SiegeOfBoralus/Options/Colors.lua
index ad5dc417d..d9284256a 100644
--- a/BfA/SiegeOfBoralus/Options/Colors.lua
+++ b/BfA/SiegeOfBoralus/Options/Colors.lua
@@ -53,6 +53,7 @@ BigWigs:AddColors("Siege of Boralus Trash", {
 	[256957] = {"red","yellow"},
 	[257169] = "red",
 	[257170] = "yellow",
+	[257270] = {"blue","yellow"},
 	[257288] = "purple",
 	[257732] = "yellow",
 	[268260] = "orange",
diff --git a/BfA/SiegeOfBoralus/Options/Sounds.lua b/BfA/SiegeOfBoralus/Options/Sounds.lua
index 6a97b3ad3..1591cecdb 100644
--- a/BfA/SiegeOfBoralus/Options/Sounds.lua
+++ b/BfA/SiegeOfBoralus/Options/Sounds.lua
@@ -53,6 +53,7 @@ BigWigs:AddSounds("Siege of Boralus Trash", {
 	[256957] = {"alert","warning"},
 	[257169] = "warning",
 	[257170] = "long",
+	[257270] = "alarm",
 	[257288] = "alarm",
 	[257732] = "alert",
 	[268260] = "alarm",
diff --git a/BfA/SiegeOfBoralus/Trash.lua b/BfA/SiegeOfBoralus/Trash.lua
index 51824d0c3..d6ad1b4d3 100644
--- a/BfA/SiegeOfBoralus/Trash.lua
+++ b/BfA/SiegeOfBoralus/Trash.lua
@@ -13,6 +13,7 @@ mod:RegisterEnableMob(
 	144071, -- Irontide Waveshaper
 	141284, -- Kul Tiran Wavetender (Horde)
 	129369, -- Irontide Raider
+	129371, -- Riptide Shredder
 	138019, -- Kul Tiran Vanguard (Horde)
 	128969, -- Ashvane Commander
 	135263, -- Ashvane Spotter
@@ -22,8 +23,7 @@ mod:RegisterEnableMob(
 	129366, -- Bilge Rat Buccaneer
 	135241, -- Bilge Rat Pillager
 	129367, -- Bilge Rat Tempest
-	137516, -- Ashvane Invader
-	129371 -- Riptide Shredder
+	137516 -- Ashvane Invader
 )
 
 --------------------------------------------------------------------------------
@@ -38,6 +38,7 @@ if L then
 	L.waveshaper = "Irontide Waveshaper"
 	L.wavetender = "Kul Tiran Wavetender"
 	L.raider = "Irontide Raider"
+	L.shredder = "Riptide Shredder"
 	L.vanguard = "Kul Tiran Vanguard"
 	L.commander = "Ashvane Commander"
 	L.spotter = "Ashvane Spotter"
@@ -47,7 +48,6 @@ if L then
 	L.pillager = "Bilge Rat Pillager"
 	L.tempest = "Bilge Rat Tempest"
 	L.invader = "Ashvane Invader"
-	L.shredder = "Riptide Shredder"
 
 	L.gate_open = CL.gate_open
 	L.gate_open_desc = "Show a bar indicating when the Kul Tiran Wavetender will open the gate after Dread Captain Lockwood."
@@ -72,6 +72,8 @@ function mod:GetOptions()
 		-- Irontide Raider
 		{272662, "NAMEPLATE"}, -- Iron Hook
 		{257170, "NAMEPLATE"}, -- Savage Tempest
+		-- Riptide Shredder
+		{257270, "NAMEPLATE", "OFF"}, -- Iron Ambush
 		-- Kul Tiran Vanguard
 		{257288, "NAMEPLATE"}, -- Heavy Slash
 		-- Ashvane Commander
@@ -92,13 +94,12 @@ function mod:GetOptions()
 		{272571, "NAMEPLATE"}, -- Choking Waters
 		-- Ashvane Invader
 		{275835, "TANK", "NAMEPLATE"}, -- Stinging Venom Coating
-		-- Riptide Shredder
-		{257270, "NAMEPLATE"}, -- Iron Ambush
 	}, {
 		[256627] = L.halberd.." / "..L.enforcer,
 		[256640] = L.bomber,
 		[256957] = L.wavetender.." / "..L.waveshaper,
 		[272662] = L.raider,
+		[257270] = L.shredder,
 		[257288] = L.vanguard,
 		[454437] = L.commander,
 		[272421] = L.spotter,
@@ -108,7 +109,6 @@ function mod:GetOptions()
 		[454440] = L.pillager,
 		[272571] = L.tempest,
 		[275835] = L.invader,
-		[257270] = L.shredder,
 	}
 end
 
@@ -139,6 +139,11 @@ function mod:OnBossEnable()
 	self:Log("SPELL_CAST_START", "SavageTempest", 257170)
 	self:Death("IrontideRaiderDeath", 129369)
 
+	-- Riptide Shredder
+	self:RegisterEngageMob("RiptideShredderEngaged", 129371)
+	self:Log("SPELL_CAST_SUCCESS", "IronAmbush", 257270)
+	self:Death("RiptideShredderDeath", 129371)
+
 	-- Kul Tiran Vanguard (Horde-only)
 	self:RegisterEngageMob("KulTiranVanguardEngaged", 138019)
 	self:Log("SPELL_CAST_START", "HeavySlash", 257288)
@@ -194,11 +199,6 @@ function mod:OnBossEnable()
 	self:RegisterEngageMob("AshvaneInvaderEngaged", 137516)
 	self:Log("SPELL_CAST_SUCCESS", "StingingVenomCoating", 275835)
 	self:Death("AshvaneInvaderDeath", 137516)
-
-	-- Riptide Shredder
-	self:RegisterEngageMob("RiptideShredderEngaged", 129371)
-	self:Log("SPELL_CAST_SUCCESS", "IronAmbush", 257270)
-	self:Death("RiptideShredderDeath", 129371)
 end
 
 --------------------------------------------------------------------------------
@@ -327,6 +327,28 @@ function mod:IrontideRaiderDeath(args)
 	self:ClearNameplate(args.destGUID)
 end
 
+-- Riptide Shredder
+
+function mod:RiptideShredderEngaged(guid)
+	self:Nameplate(257270, 14.5, guid) -- Iron Ambush
+end
+
+do
+	local prev = 0
+	function mod:IronAmbush(args)
+		self:Nameplate(args.spellId, 25.5, args.sourceGUID)
+		if args.time - prev > 2 then
+			prev = args.time
+			self:TargetMessage(args.spellId, "yellow", args.destName)
+			self:PlaySound(args.spellId, "alarm")
+		end
+	end
+end
+
+function mod:RiptideShredderDeath(args)
+	self:ClearNameplate(args.destGUID)
+end
+
 -- Kul Tiran Vanguard (Horde-only)
 
 function mod:KulTiranVanguardEngaged(guid)
@@ -561,19 +583,3 @@ end
 function mod:AshvaneInvaderDeath(args)
 	self:ClearNameplate(args.destGUID)
 end
-
--- Riptide Shredder
-
-function mod:RiptideShredderEngaged(guid)
-	self:Nameplate(257270, 14.5, guid) -- Iron Ambush
-end
-
-function mod:IronAmbush(args)
-	self:Message(args.spellId, "purple")
-	self:Nameplate(args.spellId, 25.5, args.sourceGUID)
-	self:PlaySound(args.spellId, "alarm")
-end
-
-function mod:RiptideShredderDeath(args)
-	self:ClearNameplate(args.destGUID)
-end