Tweaks and cleanups

AQ20/Ayamiss.lua

@@ -35,7 +35,7 @@ function mod:GetOptions()
 		17742, -- Cloud of Disease
 	},nil,{
 		[25725] = L.sacrifice, -- Paralyze (Sacrifice)
-		[8269] = CL.hp:format(20), -- Frenzy / Enrage (20% HP)
+		[8269] = CL.health_percent:format(20), -- Frenzy / Enrage (20% Health)
 	}
 end
 

AQ20/Kurinnaxx.lua

@@ -27,7 +27,7 @@ function mod:GetOptions()
 		{25648, "SAY", "ME_ONLY_EMPHASIZE"}, -- Sand Trap
 		26527, -- Frenzy / Enrage (different name on classic era)
 	},nil,{
-		[26527] = CL.hp:format(30), -- Frenzy / Enrage (30% HP)
+		[26527] = CL.health_percent:format(30), -- Frenzy / Enrage (30% Health)
 	}
 end
 

AQ20/Rajaxx.lua

@@ -43,7 +43,7 @@ function mod:GetOptions()
 		25462, -- Enlarge
 		26550, -- Lightning Cloud
 	},nil,{
-		[8269] = CL.hp:format(30), -- Frenzy / Enrage (30% HP)
+		[8269] = CL.health_percent:format(30), -- Frenzy / Enrage (30% Health)
 		[25599] = CL.knockback, -- Thundercrash (Knockback)
 	}
 end

AQ40/BugFamily.lua

@@ -7,6 +7,12 @@ if not mod then return end
 mod:RegisterEnableMob(15543, 15544, 15511) -- Princess Yauj, Vem, Lord Kri
 mod:SetEncounterID(710)
 
+--------------------------------------------------------------------------------
+-- Locals
+--
+
+local deaths = 0
+
 --------------------------------------------------------------------------------
 -- Initialization
 --
@@ -17,6 +23,7 @@ function mod:GetOptions()
 		26580, -- Fear
 		25812, -- Toxic Volley
 		25786, -- Toxic Vapors
+		"stages",
 	},nil,{
 		[26580] = CL.fear, -- Fear (Fear)
 	}
@@ -32,10 +39,12 @@ function mod:OnBossEnable()
 	self:Log("SPELL_PERIODIC_DAMAGE", "ToxicVaporsDamage", 25786)
 	self:Log("SPELL_PERIODIC_MISSED", "ToxicVaporsDamage", 25786)
 
-	self:Death("YaujDies", 15543)
+	self:Death("YaujDies", 15543) -- Princess Yauj
+	self:Death("Deaths", 15544, 15511) -- Vem, Lord Kri
 end
 
 function mod:OnEngage()
+	deaths = 0
 	self:CDBar(25807, 8.1) -- Great Heal
 	self:CDBar(26580, 11.3, CL.fear) -- Fear
 end
@@ -82,8 +91,16 @@ do
 	end
 end
 
-function mod:YaujDies()
+function mod:YaujDies(args)
 	self:StopBar(CL.cast:format(self:SpellName(25807))) -- Great Heal
 	self:StopBar(25807) -- Great Heal
 	self:StopBar(CL.fear) -- Fear
+	self:Deaths(args)
+end
+
+function mod:Deaths(args)
+	deaths = deaths + 1
+	if deaths < 3 then
+		self:Message("stages", "cyan", CL.mob_killed:format(args.destName, deaths, 3), false)
+	end
 end

AQ40/Cthun.lua

@@ -19,8 +19,8 @@ local timeP1GlareStart = 48 -- delay for first dark glare from engage onwards
 local timeP1Glare = 86 -- interval for dark glare
 local timeP1GlareDuration = 40 -- duration of dark glare
 
-local firstGlare = nil
-local firstWarning = nil
+local firstGlare = false
+local firstWarning = false
 local lastKnownCThunTarget = nil
 
 local timerDarkGlare = nil
@@ -102,9 +102,10 @@ function mod:OnEngage()
 
 	self:Message("stages", "cyan", CL.stage:format(1), false)
 
-	self:Bar(26029, timeP1GlareStart) -- Dark Glare
-	self:DelayedMessage(26029, timeP1GlareStart - 5, "orange", CL.custom_sec:format(self:SpellName(26029), 5)) -- Dark Glare in 5 sec
-	self:DelayedMessage(26029, timeP1GlareStart, "red", 26029, 26029) -- Dark Glare
+	local darkGlare = self:SpellName(26029)
+	self:Bar(26029, timeP1GlareStart, darkGlare) -- Dark Glare
+	self:DelayedMessage(26029, timeP1GlareStart - 5, "orange", CL.custom_sec:format(darkGlare, 5)) -- Dark Glare in 5 sec
+	self:DelayedMessage(26029, timeP1GlareStart, "red", darkGlare, 26029) -- Dark Glare
 
 	timerDarkGlare = self:ScheduleTimer("DarkGlare", timeP1GlareStart)
 	timerGroupWarning = self:ScheduleTimer("GroupWarning", timeP1GlareStart - 3)
@@ -229,21 +230,21 @@ do
 end
 
 function mod:CThunWeakened()
-	self:StopBar(L.eye_tentacles)
-	self:StopBar(L.giant_claw_tentacle)
-	self:StopBar(L.giant_eye_tentacle)
-
 	self:Message("weakened", "green", CL.duration:format(CL.weakened, 45), L.weakened_icon)
 	self:Bar("weakened", 45, L.weakened, L.weakened_icon)
 
-	--self:Bar("giant_claw_tentacle", 12.3, L.giant_claw_tentacle, L.giant_claw_tentacle_icon)
-	self:Bar("eye_tentacles", 70, L.eye_tentacles, L.eye_tentacles_icon)
-	--self:Bar("giant_eye_tentacle", 43.1, L.giant_eye_tentacle, L.giant_eye_tentacle_icon)
+	self:Bar("giant_claw_tentacle", 51, L.giant_claw_tentacle, L.giant_claw_tentacle_icon)
+	self:Bar("eye_tentacles", 81, L.eye_tentacles, L.eye_tentacles_icon)
+	self:Bar("giant_eye_tentacle", 82, L.giant_eye_tentacle, L.giant_eye_tentacle_icon)
 
 	self:PlaySound("weakened", "long")
 end
 
 function mod:GroupWarning()
+	if firstWarning then
+		firstWarning = false
+		timerGroupWarning = self:ScheduleRepeatingTimer("GroupWarning", timeP1Glare)
+	end
 	if lastKnownCThunTarget then
 		for unit in self:IterateGroup() do
 			local guid = self:UnitGUID(unit)
@@ -266,25 +267,19 @@ function mod:GroupWarning()
 			end
 		end
 	end
-	if firstWarning then
-		firstWarning = nil
-		self:CancelTimer(timerGroupWarning)
-		timerGroupWarning = self:ScheduleRepeatingTimer("GroupWarning", timeP1Glare)
-	end
 end
 
 function mod:DarkGlare()
-	self:CastBar(26029, timeP1GlareDuration)
-	self:Bar(26029, timeP1Glare) -- Dark Glare
-	local darkGlare = self:SpellName(26029)
-	self:DelayedMessage(26029, timeP1Glare - .1, "red", CL.incoming:format(darkGlare), 26029) -- Dark Glare
-	self:DelayedMessage(26029, timeP1Glare - 5, "orange", CL.custom_sec:format(darkGlare, 5)) -- Dark Glare in 5 sec
-	self:DelayedMessage(26029, timeP1GlareDuration, "red", CL.over:format(darkGlare)) -- Dark Glare Over
 	if firstGlare then
-		firstGlare = nil
-		self:CancelTimer(timerDarkGlare)
+		firstGlare = false
 		timerDarkGlare = self:ScheduleRepeatingTimer("DarkGlare", timeP1Glare)
 	end
+	local darkGlare = self:SpellName(26029)
+	self:CastBar(26029, timeP1GlareDuration, darkGlare)
+	self:Bar(26029, timeP1Glare, darkGlare) -- Dark Glare
+	self:DelayedMessage(26029, timeP1Glare - .1, "red", darkGlare, 26029) -- Dark Glare
+	self:DelayedMessage(26029, timeP1Glare - 5, "orange", CL.custom_sec:format(darkGlare, 5)) -- Dark Glare in 5 sec
+	self:DelayedMessage(26029, timeP1GlareDuration, "red", CL.over:format(darkGlare)) -- Dark Glare Over
 end
 
 function mod:DigestiveAcidApplied(args)
@@ -297,7 +292,7 @@ function mod:DigestiveAcidApplied(args)
 end
 
 function mod:DigestiveAcidAppliedDose(args)
-	if self:Me(args.destGUID) and args.amount % 2 == 0 then
+	if self:Me(args.destGUID) and (args.amount % 2 == 0 or args.amount > 6) then
 		self:StackMessage(args.spellId, "blue", args.destName, args.amount, 6)
 		if args.amount >= 6 then
 			self:PlaySound(args.spellId, "warning", nil, args.destName)

AQ40/Huhuran.lua

@@ -24,7 +24,7 @@ function mod:GetOptions()
 		26051, -- Enrage / Frenzy (different name on classic era)
 		"berserk",
 	},nil,{
-		["berserk"] = CL.hp:format(30), -- Berserk (30% HP)
+		["berserk"] = CL.health_percent:format(30), -- Berserk (30% Health)
 	}
 end
 
@@ -44,6 +44,7 @@ function mod:OnEngage()
 	poisonTime = 0
 	self:RegisterEvent("UNIT_HEALTH")
 	self:Berserk(300)
+	self:CDBar(26180, 21) -- Wyvern Sting, can randomly be way higher
 end
 
 --------------------------------------------------------------------------------

AQ40/Sartura.lua

@@ -24,7 +24,7 @@ function mod:GetOptions()
 		"stages",
 		"berserk",
 	},nil,{
-		[8269] = CL.hp:format(25), -- Frenzy / Enrage (25% HP)
+		[8269] = CL.health_percent:format(25), -- Frenzy / Enrage (25% Health)
 	}
 end
 

AQ40/Trash.lua

@@ -151,7 +151,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
@@ -198,11 +198,13 @@ do
 end
 
 function mod:EnrageApplied(args)
-	local icon = self:GetIconTexture(self:GetIcon(args.destRaidFlags))
-	if icon then
-		self:Message(args.spellId, "red", icon .. CL.percent:format(30, args.spellName))
-	else
-		self:Message(args.spellId, "red", CL.percent:format(30, args.spellName))
+	if self:MobId(args.destGUID) == 15264 then -- Anubisath Sentinel
+		local icon = self:GetIconTexture(self:GetIcon(args.destRaidFlags))
+		if icon then
+			self:Message(args.spellId, "red", icon .. CL.percent:format(30, args.spellName))
+		else
+			self:Message(args.spellId, "red", CL.percent:format(30, args.spellName))
+		end
 	end
 end
 

AQ40/Viscidus.lua

@@ -91,20 +91,40 @@ do
 	end
 end
 
-function mod:FrostDamage(args)
-	if args.spellSchool == 0x10 and self:MobId(args.destGUID) == 15299 then -- 0x10 is Frost
-		frostCount = frostCount + 1
-		if frostCount < 20 and frostCount % 3 == 0 then
-			self:Message("freeze", "green", L.freeze_warn_frost:format(frostCount, 20-frostCount), L.freeze_icon)
+if mod:Vanilla() then
+	function mod:FrostDamage(args)
+		if args.spellSchool == 0x10 and self:MobId(args.destGUID) == 15299 then -- 0x10 is Frost
+			frostCount = frostCount + 1
+			if (frostCount <= 190 and frostCount % 20 == 0) or (frostCount > 190 and frostCount < 210) then
+				self:Message("freeze", "green", L.freeze_warn_frost:format(frostCount, 200-frostCount), L.freeze_icon)
+			end
+		end
+	end
+
+	function mod:SwingDamage(args)
+		if swingCount ~= -1 and self:MobId(args.destGUID) == 15299 then
+			swingCount = swingCount + 1
+			if (swingCount < 190 and swingCount % 20 == 0) or (swingCount > 190 and swingCount < 210) then
+				self:Message("freeze", "green", L.freeze_warn_melee:format(swingCount, 200-swingCount), L.freeze_icon)
+			end
+		end
+	end
+else
+	function mod:FrostDamage(args)
+		if args.spellSchool == 0x10 and self:MobId(args.destGUID) == 15299 then -- 0x10 is Frost
+			frostCount = frostCount + 1
+			if frostCount < 20 and frostCount % 3 == 0 then
+				self:Message("freeze", "green", L.freeze_warn_frost:format(frostCount, 20-frostCount), L.freeze_icon)
+			end
 		end
 	end
-end
 
-function mod:SwingDamage(args)
-	if swingCount ~= -1 and self:MobId(args.destGUID) == 15299 then
-		swingCount = swingCount + 1
-		if swingCount < 30 and swingCount % 3 == 0 then
-			self:Message("freeze", "green", L.freeze_warn_melee:format(swingCount, 30-swingCount), L.freeze_icon)
+	function mod:SwingDamage(args)
+		if swingCount ~= -1 and self:MobId(args.destGUID) == 15299 then
+			swingCount = swingCount + 1
+			if swingCount < 30 and swingCount % 3 == 0 then
+				self:Message("freeze", "green", L.freeze_warn_melee:format(swingCount, 30-swingCount), L.freeze_icon)
+			end
 		end
 	end
 end

BlackfathomDeeps_Classic/Ghamoo-ra.lua

@@ -65,7 +65,11 @@ end
 
 function mod:CrunchArmorApplied(args)
 	if self:Me(args.destGUID) then
-		self:StackMessage(args.spellId, "blue", args.destName, args.amount, 3)
+		local amount = args.amount or 1
+		self:StackMessage(args.spellId, "blue", args.destName, amount, 3)
+		if amount >= 3 then
+			self:PlaySound(args.spellId, "alert")
+		end
 	elseif args.amount and self:Player(args.destFlags) then -- Players, not pets
 		local bossUnit = self:GetUnitIdByGUID(args.sourceGUID)
 		if bossUnit and self:Tanking(bossUnit, args.destName) then

BlackwingLair/Chromaggus.lua

@@ -49,7 +49,7 @@ function mod:GetOptions()
 		23174, -- Chromatic Mutation
 		"vulnerability",
 	},nil,{
-		[23537] = CL.hp:format(20), -- Frenzy / Enrage (20% HP)
+		[23537] = CL.health_percent:format(20), -- Frenzy / Enrage (20% Health)
 		[23174] = CL.mind_control, -- Chromatic Mutation (Mind Control)
 	}
 end

BlackwingLair/Locales/deDE.lua

@@ -39,6 +39,7 @@ if L then
 	L.shaman_class_call_yell_trigger = "Schamane, zeigt mir was"
 	L.deathknight_class_call_yell_trigger = "Todesritter"
 	--L.monk_class_call_yell_trigger = "Monks"
+	L.hunter_class_call_yell_trigger = "Jäger und ihre lästigen"
 
 	L.warnshaman = "Schamanen - Totems!"
 	L.warndruid = "Druiden - Gefangen in Katzenform!"

BlackwingLair/Locales/esES.lua

@@ -39,6 +39,7 @@ if L then
 	L.shaman_class_call_yell_trigger = "Chamanes"
 	L.deathknight_class_call_yell_trigger = "Caballeros de la Muerte"
 	L.monk_class_call_yell_trigger = "Monjes"
+	L.hunter_class_call_yell_trigger = "Cazadores"
 
 	L.warnshaman = "¡Chamanes - aparecen tótems!"
 	L.warndruid = "¡Druidas - atrapado en forma felina!"

BlackwingLair/Locales/esMX.lua

@@ -39,6 +39,7 @@ if L then
 	L.shaman_class_call_yell_trigger = "Chamanes"
 	L.deathknight_class_call_yell_trigger = "Caballeros de la Muerte"
 	L.monk_class_call_yell_trigger = "Monjes"
+	L.hunter_class_call_yell_trigger = "Cazadores"
 
 	L.warnshaman = "¡Chamanes - aparecen tótems!"
 	L.warndruid = "¡Druidas - atrapado en forma felina!"

BlackwingLair/Locales/frFR.lua

@@ -39,6 +39,7 @@ if L then
 	L.shaman_class_call_yell_trigger = "Chamans, montrez moi"
 	L.deathknight_class_call_yell_trigger = "Chevalier de la mort"
 	--L.monk_class_call_yell_trigger = "Monks"
+	L.hunter_class_call_yell_trigger = "Ah, les chasseurs et les stupides"
 
 	L.warnshaman = "Chamans - Totems posés !"
 	L.warndruid = "Druides - Coincés en forme de félin !"

BlackwingLair/Locales/itIT.lua

@@ -39,6 +39,7 @@ if L then
 	--L.shaman_class_call_yell_trigger = "Shamans"
 	--L.deathknight_class_call_yell_trigger = "Death Knights"
 	--L.monk_class_call_yell_trigger = "Monks"
+	--L.hunter_class_call_yell_trigger = "Hunters"
 
 	--L.warnshaman = "Shamans - Totems spawned!"
 	--L.warndruid = "Druids - Stuck in cat form!"
@@ -57,7 +58,7 @@ if L then
 	--L.classcall_desc = "Warn for Class Calls."
 
 	--L.add = "Drakonid deaths"
-	--L.add_desc = "Announce the number of adds killed in Phase 1 before Nefarian lands."
+	--L.add_desc = "Announce the number of adds killed in stage 1 before Nefarian lands."
 end
 
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "itIT")

BlackwingLair/Locales/koKR.lua

@@ -39,6 +39,7 @@ if L then
 	L.shaman_class_call_yell_trigger = "주술사"
 	--L.deathknight_class_call_yell_trigger = "Death Knights"
 	--L.monk_class_call_yell_trigger = "Monks"
+	L.hunter_class_call_yell_trigger = "그 장난감"
 
 	L.warnshaman = "주술사 - 토템 파괴!"
 	L.warndruid = "드루이드 - 강제 표범 변신!"
@@ -57,7 +58,7 @@ if L then
 	L.classcall_desc = "직업 지목에 대한 경고"
 
 	--L.add = "Drakonid deaths"
-	--L.add_desc = "Announce the number of adds killed in Phase 1 before Nefarian lands."
+	--L.add_desc = "Announce the number of adds killed in stage 1 before Nefarian lands."
 end
 
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "koKR")

BlackwingLair/Locales/ptBR.lua

@@ -40,6 +40,7 @@ if L then
 	L.shaman_class_call_yell_trigger = "Xamãs"
 	--L.deathknight_class_call_yell_trigger = "Death Knights"
 	--L.monk_class_call_yell_trigger = "Monks"
+	--L.hunter_class_call_yell_trigger = "Hunters"
 
 	L.warnshaman = "Xamãs - Totens aparecendo!"
 	L.warndruid = "Druidas - Presos na forma de felino!"

BlackwingLair/Locales/ruRU.lua

@@ -39,6 +39,7 @@ if L then
 	L.shaman_class_call_yell_trigger = "Шаманы! Покажитесь мне!"
 	L.deathknight_class_call_yell_trigger = "Рыцари смерти! Сюда!"
 	--L.monk_class_call_yell_trigger = "Monks"
+	L.hunter_class_call_yell_trigger = "Охотники и ваше раздражение"
 
 	L.warnshaman = "Шаманы - ставьте тотемы!"
 	L.warndruid = "Друиды - пробудите в себе зверя!"
@@ -57,7 +58,7 @@ if L then
 	L.classcall_desc = "Предупреждать о классовом вызове."
 
 	--L.add = "Drakonid deaths"
-	--L.add_desc = "Announce the number of adds killed in Phase 1 before Nefarian lands."
+	--L.add_desc = "Announce the number of adds killed in stage 1 before Nefarian lands."
 end
 
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "ruRU")