Updates and cleanups for classic

Blackwing/Atramedes.lua

@@ -99,7 +99,7 @@ function mod:OnEngage()
 	end
 	self:OpenAltPower("altpower", self:SpellName(-3072)) -- "Sound"
 	self:OpenInfo(77611, "BigWigs: ".. CL.shield)
-	self:SetInfo(77611, 1, "10 remaining")
+	self:SetInfo(77611, 1, CL.remaining:format(10))
 	self:SetInfoBar(77611, 1, 1)
 end
 
@@ -115,7 +115,7 @@ do
 		self:CDBar(77672, 12.3) -- Sonar Pulse
 		self:CDBar(77612, 14, CL.count:format(self:SpellName(77612), modulationCount)) -- Modulation
 		self:CDBar(78075, 24) -- Sonic Breath
-		self:Bar(77840, 39, CL.count:format(self:SpellName(77840), searingFlameCount)) -- Searing Flame
+		self:Bar(77840, self:Classic() and 47 or 39, CL.count:format(self:SpellName(77840), searingFlameCount)) -- Searing Flame
 		self:PlaySound("stages", "long")
 	end
 	function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, _, spellId)
@@ -177,7 +177,7 @@ do
 			local colorName = self:ColorName(args.sourceName)
 			table.insert(shieldClickers, 2, ("%d %s"):format(shieldCount, colorName))
 			self:Message(77611, "cyan", CL.other:format(CL.count:format(CL.shield, shieldCount), colorName), false)
-			self:SetInfo(77611, 1, ("%d remaining"):format(10-shieldCount))
+			self:SetInfo(77611, 1, CL.remaining:format(10-shieldCount))
 			local per = shieldCount / 10
 			self:SetInfoBar(77611, 1, 1-per)
 			for i = 2, 5 do
@@ -206,10 +206,12 @@ end
 
 do
 	function mod:PesteredApplied(args)
-		if self:Me(args.destGUID) then
-			self:Yell(args.spellId, CL.add, nil, "Add")
+		if self:Player(args.destFlags) then -- The add itself also gains it
+			if self:Me(args.destGUID) then
+				self:Yell(args.spellId, CL.add, nil, "Add")
+			end
+			self:TargetMessage(args.spellId, "red", args.destName, CL.add)
+			self:PlaySound(args.spellId, "alarm", nil, args.destName)
 		end
-		self:TargetMessage(args.spellId, "red", args.destName, CL.add)
-		self:PlaySound(args.spellId, "alarm", nil, args.destName)
 	end
 end

Blackwing/Locales/deDE.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "Warnt vor dem nach vorne Schlittern, das das Rodeo erlaubt zu starten."
 	L.slump_bar = "Rodeo"
 	L.slump_message = "Yeehaa, Rodeo!"
-	L.slump_emote_trigger = "%s schlittert nach vorne und entblößt seine Zangen!" -- check
 
 	L.expose_emote_trigger = "Kopf" -- check
 end

Blackwing/Locales/esES.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "Cae hacia delante exponiendose a sí mismo, permitiendo que el rodeo empiece."
 	L.slump_bar = "Rodeo"
 	L.slump_message = "¡Yeepah, móntalo!"
-	L.slump_emote_trigger = "¡%s cae hacia delante y deja expuestas sus tenazas!"
 
 	L.expose_emote_trigger = "cabeza"
 end

Blackwing/Locales/esMX.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "Cae hacia delante exponiendose a sí mismo, permitiendo que el rodeo empiece."
 	L.slump_bar = "Rodeo"
 	L.slump_message = "¡Yeepah, móntalo!"
-	L.slump_emote_trigger = "¡%s cae hacia delante y deja expuestas sus tenazas!"
 
 	L.expose_emote_trigger = "cabeza"
 end

Blackwing/Locales/frFR.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "Prévient quand le boss s'affale vers l'avant et s'expose, permettant ainsi au rodéo de commencer."
 	L.slump_bar = "Rodéo"
 	L.slump_message = "Yeehaw, chevauchez !"
-	L.slump_emote_trigger = "%s s'affale vers l'avant et expose ses pinces !"
 
 	L.expose_emote_trigger = "expose sa tête"
 end

Blackwing/Locales/itIT.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "Avvisa il crollo di Magmaw ed espone la sua testa, permettendo ai cavalcatori del rodeo di iniziare."
 	L.slump_bar = "Rodeo"
 	L.slump_message = "Oh Sììì, cavalchiamo!!!"
-	L.slump_emote_trigger = "%s crolla a terra, mostrando le sue chele!"
 
 	L.expose_emote_trigger = "testa"
 end

Blackwing/Locales/koKR.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "슬럼프 상태를 알립니다."
 	L.slump_bar = "로데오"
 	L.slump_message = "올라타세요~!"
-	L.slump_emote_trigger = "%s|1이;가; 집게를 드러내며 앞으로 몸을 기울입니다!"
 
 	L.expose_emote_trigger = "%s|1이;가; 창에 꽂혀 머리가 노출되었습니다!"
 end

Blackwing/Locales/ptBR.lua

@@ -7,8 +7,7 @@ if L then
 	L.slump = "Cair"
 	L.slump_desc = "Magorja cai e fica exposto, permitindo que o rodeio começe."
 	L.slump_bar = "Rodeio"
-	L.slump_message = "Yeeeha!!! MONTA NELE!!!"
-	L.slump_emote_trigger = "%s cai para frente, expondo as pinças!"
+	L.slump_message = "Yeeeha!! MONTA NELE!!"
 
 	L.expose_emote_trigger = "cabeça"
 end

Blackwing/Locales/ruRU.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "Магмарь падает вперед открывая себя, позволяя начать родео."
 	L.slump_bar = "Родео"
 	L.slump_message = "Йихо, погнали!"
-	L.slump_emote_trigger = "%s внезапно падает, выставляя клешни!"
 
 	L.expose_emote_trigger = "голову"
 end

Blackwing/Locales/zhCN.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "当熔喉扑倒并暴露后脑时发出警报。需要骑乘。"
 	L.slump_bar = "骑乘"
 	L.slump_message = "嘿，快骑上它！"
-	L.slump_emote_trigger = "%s向前倒下，暴露出他的钳子！"
 
 	L.expose_emote_trigger = "将自己钉在刺上，露出了他的头"
 end

Blackwing/Locales/zhTW.lua

@@ -8,7 +8,6 @@ if L then
 	L.slump_desc = "當熔喉撲倒並暴露時發出警報。"
 	L.slump_bar = "騎乘"
 	L.slump_message = "嘿，快騎上它！"
-	L.slump_emote_trigger = "%s往前撲倒，露出他的鉗子!"
 
 	L.expose_emote_trigger = "露出了他的頭"
 end

Blackwing/Magmaw.lua

@@ -16,7 +16,7 @@ mod:SetStage(1)
 local isHeadPhase = false
 local isNewHeadPhase = false
 local lavaSpewCount = 1
-local massiveCrashCount = 0
+local massiveCrashCount = 1
 local headGUID = nil
 
 --------------------------------------------------------------------------------
@@ -33,7 +33,6 @@ if L then
 	L.slump_desc = "Warn for when Magmaw slumps forward and exposes himself, allowing the riding rodeo to start."
 	L.slump_bar = "Rodeo"
 	L.slump_message = "Yeehaw, ride on!"
-	L.slump_emote_trigger = "%s slumps forward, exposing his pincers!"
 
 	L.expose_emote_trigger = "head"
 end
@@ -46,6 +45,7 @@ function mod:GetOptions()
 	return {
 		-- Normal
 		"slump",
+		88253, -- Massive Crash
 		{79011, "EMPHASIZE"}, -- Point of Vulnerability
 		78006, -- Pillar of Flame
 		{78941, "SAY", "SAY_COUNTDOWN", "ME_ONLY_EMPHASIZE"}, -- Parasitic Infection
@@ -99,11 +99,11 @@ function mod:OnEngage()
 	isHeadPhase = false
 	isNewHeadPhase = false
 	lavaSpewCount = 1
-	massiveCrashCount = 0
+	massiveCrashCount = 1
 	headGUID = nil
 	self:SetStage(1)
 	self:Berserk(600)
-	self:Bar("slump", 100, L.slump_bar, 36702)
+	self:Bar("slump", 100, CL.count:format(L.slump_bar, massiveCrashCount), 36702) -- Slump/Rodeo/Massive Crash
 	self:CDBar(78006, 30) -- Pillar of Flame
 	self:CDBar(77690, 24, CL.count:format(self:SpellName(77690), lavaSpewCount)) -- Lava Spew
 	self:CDBar(89773, 90) -- Mangle
@@ -128,13 +128,13 @@ end
 
 function mod:INSTANCE_ENCOUNTER_ENGAGE_UNIT()
 	if headGUID then
-		local headUnit = self:GetUnitIdByGUID(headGUID)
+		local headUnit = self:GetBossId(headGUID)
 		if not isNewHeadPhase and headUnit then
 			isNewHeadPhase = true
 			self:Message(79011, "green", self:SpellName(79011), false, true) -- XXX TEST
 		elseif isNewHeadPhase and not headUnit then
 			isNewHeadPhase = false
-			self:Message(79011, "green", CL.over:format(self:SpellName(79011)), false, true) -- XXX TEST
+			self:Message(79011, "green", CL.removed:format(self:SpellName(79011)), false, true) -- XXX TEST
 		end
 	end
 end
@@ -150,12 +150,7 @@ do
 		mod:CDBar(77690, 4.5, CL.count:format(mod:SpellName(77690), lavaSpewCount)) -- Lava Spew
 	end
 	function mod:CHAT_MSG_RAID_BOSS_EMOTE(_, msg)
-		if msg:find(L.slump_emote_trigger, nil, true) then
-			self:StopBar(78006) -- Pillar of Flame
-			self:Bar("slump", 95, L.slump_bar, 36702)
-			self:Message("slump", "green", L.slump_message, 36702)
-			self:PlaySound("slump", "info")
-		elseif msg:find(L.expose_emote_trigger, nil, true) then
+		if msg:find(L.expose_emote_trigger, nil, true) then
 			isHeadPhase = true
 			self:Message(79011, "green", CL.weakened)
 			self:Bar(79011, 30, CL.weakened)
@@ -167,9 +162,21 @@ do
 	end
 end
 
-function mod:MassiveCrash(args)
-	massiveCrashCount = massiveCrashCount + 1
-	self:Message("slump", "green", CL.count:format(args.spellName, massiveCrashCount), false, true) -- XXX TEST
+do
+	local function Rodeo()
+		if mod:IsEngaged() then
+			mod:StopBar(CL.count:format(L.slump_bar, massiveCrashCount))
+			mod:Message("slump", "green", CL.count:format(L.slump_message, massiveCrashCount), 36702)
+			massiveCrashCount = massiveCrashCount + 1
+			mod:Bar("slump", 95, CL.count:format(L.slump_bar, massiveCrashCount), 36702)
+		end
+	end
+	function mod:MassiveCrash(args)
+		self:StopBar(78006) -- Pillar of Flame
+		self:SimpleTimer(Rodeo, 2)
+		self:Message(args.spellId, "red", CL.count:format(args.spellName, massiveCrashCount))
+		self:PlaySound(args.spellId, "info")
+	end
 end
 
 function mod:ArmageddonApplied(args)

Blackwing/Omnotron.lua

@@ -60,7 +60,7 @@ function mod:GetOptions()
 		79624, -- Power Generator
 		-- Heroic
 		"nef",
-		91849, -- Grip of Death
+		{91849, "CASTBAR"}, -- Grip of Death
 		91879, -- Arcane Blowback
 		{92048, "ICON", "SAY", "SAY_COUNTDOWN", "CASTBAR", "CASTBAR_COUNTDOWN", "ME_ONLY_EMPHASIZE"}, -- Shadow Infusion
 		{92053, "SAY", "SAY_COUNTDOWN"}, -- Shadow Conductor
@@ -292,6 +292,7 @@ end
 function mod:GripOfDeath(args)
 	gripOfDeathCount = gripOfDeathCount + 1
 	self:Message(args.spellId, "orange", CL.count:format(args.spellName, gripOfDeathCount))
+	self:CastBar(args.spellId, 2, CL.count:format(args.spellName, gripOfDeathCount))
 	self:CDBar("nef", 35, CL.next_ability, L.nef_icon)
 end