Tweaks and cleanups

AQ40/Cthun.lua

@@ -4,7 +4,7 @@
 
 local mod, CL = BigWigs:NewBoss("C'Thun", 531, 1551)
 if not mod then return end
-mod:RegisterEnableMob(15727, 15589) -- C'Thun, Eye of C'Thun
+mod:RegisterEnableMob(15727, 15589, 15802) -- C'Thun, Eye of C'Thun, Flesh Tentacle
 mod:SetEncounterID(717)
 mod:SetStage(1)
 

AQ40/Trash.lua

@@ -79,6 +79,7 @@ function mod:OnBossEnable()
 	if self:Vanilla() then
 		self:Log("SPELL_AURA_APPLIED", "DetectMagicApplied", 2855)
 	end
+	self:Death("SentinelKilled", 15264)
 	self:Log("SPELL_HEAL", "HealBrethren", 26565)
 	self:Log("SPELL_AURA_APPLIED", "EnrageApplied", 8599)
 
@@ -142,7 +143,7 @@ do
 						printed = true
 						BigWigs:Print(L.detect_magic_warning)
 					end
-					if GetTime() - prevMsg > 60 then
+					if GetTime() - prevMsg > 40 then
 						prevMsg = GetTime()
 						local icon = self:GetIconTexture(self:GetIcon("target"))
 						if icon then
@@ -151,7 +152,7 @@ do
 							self:Message("target_buffs", "red", L.detect_magic_missing_message, 2855)
 						end
 					end
-					--return
+					return
 				end
 				local total = {}
 				for buffId, message in next, buffList do
@@ -184,6 +185,12 @@ do
 			self:CheckTarget()
 		end
 	end
+	function mod:SentinelKilled(args)
+		if args.destGUID ~= self:UnitGUID("target") then
+			prevGUID = nil
+			self:CheckTarget()
+		end
+	end
 end
 
 do

BlackfathomDeeps_Classic/Ghamoo-ra.lua

@@ -96,14 +96,15 @@ function mod:ExposedOver(args)
 end
 
 function mod:AquaShellApplied(args)
-	self:OpenInfo(args.spellId, "BigWigs: |T134564:0:0:0:0:64:64:4:60:4:60|t".. args.spellName)
-	self:SetInfoBar(args.spellId, 1, 1)
-	self:SetInfo(args.spellId, 1, 100)
+	self:OpenInfo(args.spellId, "BigWigs")
+	self:SetInfo(args.spellId, 1, "|T134564:0:0:0:0:64:64:4:60:4:60|t".. args.spellName)
+	self:SetInfoBar(args.spellId, 3, 1)
+	self:SetInfo(args.spellId, 3, 100)
 end
 
 function mod:AquaShellRemovedDose(args)
-	self:SetInfoBar(args.spellId, 1, args.amount/100)
-	self:SetInfo(args.spellId, 1, args.amount)
+	self:SetInfoBar(args.spellId, 3, args.amount/100)
+	self:SetInfo(args.spellId, 3, args.amount)
 end
 
 function mod:AquaShellCast() -- Aqua shell being removed, Knockback incoming

BlackwingLair/Trash.lua

@@ -83,7 +83,7 @@ do
 						printed = true
 						BigWigs:Print(L.detect_magic_warning)
 					end
-					if GetTime() - prevMsg > 60 then
+					if GetTime() - prevMsg > 40 then
 						prevMsg = GetTime()
 						local icon = self:GetIconTexture(self:GetIcon("target"))
 						if icon then
@@ -92,7 +92,7 @@ do
 							self:Message("target_vulnerability", "red", L.detect_magic_missing_message, 2855)
 						end
 					end
-					--return
+					return
 				end
 				for buffId, message in next, buffList do
 					if self:UnitBuff("target", buffId) then

Gnomeregan_Classic/Grubbis.lua

@@ -216,6 +216,9 @@ function mod:Troggquake(args)
 		self:PlaySound("stages", "info")
 	else
 		self:Message("stages", "cyan", CL.other:format(CL.stage:format(quakeCount), CL.adds), false)
+		if quakeCount == 1 then
+			self:Bar("adds", 8, CL.adds, "inv_hammer_15")
+		end
 	end
 end
 

Gnomeregan_Classic/MechanicalMenagerie.lua

@@ -118,6 +118,7 @@ end
 
 function mod:OnWin()
 	self:Message("run", "blue", L.run, false)
+	self:SimpleTimer(function() self:Message("run", "blue", L.run, false) end, 1)
 end
 
 --------------------------------------------------------------------------------

Gnomeregan_Classic/MekgineerThermaplugg.lua

@@ -151,7 +151,7 @@ do
 					local stage = self:GetStage()+1
 					self:SetStage(stage)
 					self:Message("stages", "cyan", CL.stage:format(stage), false)
-					self:StopBar(437853) -- Summon Bomb
+					self:StopBar(CL.bombs) -- Summon Bomb
 					self:StopBar(438726) -- Hazardous Hammer
 					self:StopBar(438732) -- Toxic Ventilation
 					self:StopBar(438683) -- Sprocketfire Punch
@@ -180,7 +180,7 @@ local function stageCheck(self, sourceGUID)
 	if not nextStage then return end -- No stage change
 	self:SetStage(nextStage)
 	self:Message("stages", "cyan", CL.stage:format(nextStage), false)
-	self:StopBar(437853) -- Summon Bomb
+	self:StopBar(CL.bombs) -- Summon Bomb
 	self:StopBar(438726) -- Hazardous Hammer
 	self:StopBar(438732) -- Toxic Ventilation
 	self:StopBar(438683) -- Sprocketfire Punch

Naxxramas_Classic/Horsemen.lua

@@ -149,6 +149,10 @@ function mod:ShieldWall(args)
 	local msg = CL.other:format(args.spellName, L[npcId])
 	self:Message(args.spellId, "yellow", msg)
 	self:Bar(args.spellId, 20, msg)
+	local unit = self:GetUnitIdByGUID(args.destGUID)
+	if unit and self:UnitWithinRange(unit, 35) or args.destGUID == self:UnitGUID("target") then
+		self:PlaySound(args.spellId, "long")
+	end
 end
 
 do

Naxxramas_Classic/Patchwerk.lua

@@ -13,15 +13,15 @@ mod:SetEncounterID(1118)
 
 function mod:GetOptions()
 	return {
-		28131, -- Frenzy / Enrage (different name on classic era)
+		28131, -- Enrage
 		"berserk",
 	},nil,{
-		[28131] = CL.health_percent:format(5), -- Frenzy / Enrage (5% Health)
+		[28131] = CL.health_percent:format(5), -- Enrage (5% Health)
 	}
 end
 
 function mod:OnBossEnable()
-	self:Log("SPELL_AURA_APPLIED", "FrenzyEnrage", 28131)
+	self:Log("SPELL_AURA_APPLIED", "Enrage", 28131)
 end
 
 function mod:OnEngage()
@@ -32,7 +32,7 @@ end
 -- Event Handlers
 --
 
-function mod:FrenzyEnrage(args)
+function mod:Enrage(args)
 	self:Message(args.spellId, "orange", CL.percent:format(5, args.spellName))
 	self:PlaySound(args.spellId, "long")
 end

Naxxramas_Classic/Razuvious.lua

@@ -68,7 +68,8 @@ function mod:OnEngage()
 	self:CDBar(29107, 25, self:SpellName(29107), L["29107_icon"]) -- Disrupting Shout
 	self:DelayedMessage(29107, 20, "red", CL.soon:format(self:SpellName(29107)))
 
-	self:OpenInfo(29051, "BigWigs: |T136222:0:0:0:0:64:64:4:60:4:60|t".. self:SpellName(29051))
+	self:OpenInfo(29051, "BigWigs")
+	self:SetInfo(29051, 1, "|T136222:0:0:0:0:64:64:4:60:4:60|t".. self:SpellName(29051))
 	self:SimpleTimer(UpdateInfoBoxList, 0.1)
 end
 
@@ -167,7 +168,7 @@ function UpdateInfoBoxList()
 	mod:SimpleTimer(UpdateInfoBoxList, 0.1)
 
 	local t = GetTime()
-	local line = 1
+	local line = 3
 	for i = 1, 5 do
 		local npcGUID = mindExhaustionList[i]
 		if npcGUID then