Tweaks and cleanups

AQ40/Cthun.lua

@@ -54,7 +54,6 @@ if L then
 	L.weakened = CL.weakened
 	L.weakened_desc = "Warn for Weakened state."
 	L.weakened_icon = "ability_rogue_findweakness"
-	L.weakenedtrigger = "%s is weakened"
 
 	L.dark_glare_message = "%s: %s (Group %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	L.stomach = "Stomach"
@@ -89,8 +88,6 @@ function mod:OnBossEnable()
 	self:Log("SPELL_AURA_APPLIED", "DigestiveAcidApplied", 26476)
 	self:Log("SPELL_AURA_APPLIED_DOSE", "DigestiveAcidAppliedDose", 26476)
 	self:Log("SPELL_AURA_REMOVED", "DigestiveAcidRemoved", 26476)
-	self:RegisterEvent("CHAT_MSG_MONSTER_EMOTE")
-	self:RegisterMessage("BigWigs_BossComm")
 
 	self:Death("EyeOfCThunKilled", 15589)
 	self:Death("GiantEyeTentacleKilled", 15334)
@@ -163,12 +160,6 @@ do
 	end
 end
 
-function mod:CHAT_MSG_MONSTER_EMOTE(_, msg)
-	if msg:find(L.weakenedtrigger, nil, true) then
-		self:Sync("CThunWeakened")
-	end
-end
-
 function mod:EyeOfCThunKilled()
 	deaths = 0
 	healthList = {}
@@ -213,21 +204,6 @@ function mod:GiantEyeTentacleKilled()
 	self:PrimaryIcon(26134) -- Clear icon
 end
 
-do
-	local times = {
-		["CThunWeakened"] = 0,
-	}
-	function mod:BigWigs_BossComm(_, msg)
-		if times[msg] then
-			local t = GetTime()
-			if t-times[msg] > 5 then
-				times[msg] = t
-				self[msg](self)
-			end
-		end
-	end
-end
-
 do
 	local function ResetInfoHealth(self)
 		self:SetInfoBar("infobox", 1, 1)
@@ -338,6 +314,10 @@ function mod:FleshTentacleKilled(args) -- Stomach Tentacle
 	self:SetInfo("infobox", line + 1, "0%")
 
 	self:Message("stages", "cyan", CL.mob_killed:format(args.destName, deaths, 2), false)
+
+	if deaths == 2 then
+		self:CThunWeakened()
+	end
 end
 
 function UpdateInfoBoxList()

AQ40/Fankriss.lua

@@ -54,6 +54,8 @@ function mod:SummonWorm(args)
 end
 
 function mod:Entangle(args)
-	self:TargetMessage(720, "red", args.destName)
-	self:PlaySound(720, "alarm", nil, args.destName)
+	if self:Player(args.destFlags) then -- Players, not pets
+		self:TargetMessage(720, "red", args.destName)
+		self:PlaySound(720, "alarm", nil, args.destName)
+	end
 end

AQ40/Huhuran.lua

@@ -76,7 +76,7 @@ end
 
 function mod:EnrageFrenzy(args)
 	self:CDBar(args.spellId, 14.5)
-	self:Message(args.spellId, "yellow")
+	self:Message(args.spellId, "yellow", CL.buff_boss:format(args.spellName))
 	if self:Dispeller("enrage", true) then
 		self:PlaySound(args.spellId, "alarm")
 	end

AQ40/Locales/deDE.lua

@@ -50,7 +50,6 @@ if L then
 	--L.giant_eye_tentacle_desc = "Timers for the giant eye tentacle."
 
 	--L.weakened_desc = "Warn for weakened state."
-	L.weakenedtrigger = "%s ist geschwächt"
 
 	--L.dark_glare_message = "%s: %s (Group %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/esES.lua

@@ -50,7 +50,6 @@ if L then
 	L.giant_eye_tentacle_desc = "Temporizadores para Tentáculo ocular gigante."
 
 	L.weakened_desc = "Anunciar debilidad."
-	L.weakenedtrigger = "%s está débil!"
 
 	L.dark_glare_message = "%s: %s (Grupo %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/esMX.lua

@@ -50,7 +50,6 @@ if L then
 	L.giant_eye_tentacle_desc = "Temporizadores para Tentáculo ocular gigante."
 
 	L.weakened_desc = "Anunciar debilidad."
-	L.weakenedtrigger = "%s está débil!"
 
 	L.dark_glare_message = "%s: %s (Grupo %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/frFR.lua

@@ -50,7 +50,6 @@ if L then
 	L.giant_eye_tentacle_desc = "Chronomètres pour le tentacule oculaire géant."
 
 	L.weakened_desc = "Annoncer affaiblissement."
-	L.weakenedtrigger = "%s est affaibli"
 
 	L.dark_glare_message = "%s: %s (Groupe %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/itIT.lua

@@ -50,7 +50,6 @@ if L then
 	--L.giant_eye_tentacle_desc = "Timers for the giant eye tentacle."
 
 	--L.weakened_desc = "Warn for weakened state."
-	--L.weakenedtrigger = "%s is weakened"
 
 	--L.dark_glare_message = "%s: %s (Group %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/koKR.lua

@@ -50,7 +50,6 @@ if L then
 	--L.giant_eye_tentacle_desc = "Timers for the giant eye tentacle."
 
 	--L.weakened_desc = "Warn for weakened state."
-	L.weakenedtrigger = "약해집니다"
 
 	--L.dark_glare_message = "%s: %s (Group %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/ptBR.lua

@@ -50,7 +50,6 @@ if L then
 	L.giant_eye_tentacle_desc = "Cronômetros para o tentóculo gigante."
 
 	L.weakened_desc = "Aviso para estado enfraquecido."
-	L.weakenedtrigger = "%s enfraquece"
 
 	L.dark_glare_message = "%s: %s (Grupo %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/ruRU.lua

@@ -50,7 +50,6 @@ if L then
 	L.giant_eye_tentacle_desc = "Таймеры для Огромного глазастого щупальца."
 
 	L.weakened_desc = "Предупреждение об ослаблении."
-	L.weakenedtrigger = "%s ослаблен"
 
 	--L.dark_glare_message = "%s: %s (Group %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	L.stomach = "Желудок"

AQ40/Locales/zhCN.lua

@@ -50,7 +50,6 @@ if L then
 	--L.giant_eye_tentacle_desc = "Timers for the giant eye tentacle."
 
 	L.weakened_desc = "虚弱状态警报。"
-	L.weakenedtrigger = "%s的力量被削弱了"
 
 	--L.dark_glare_message = "%s: %s (Group %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Locales/zhTW.lua

@@ -50,7 +50,6 @@ if L then
 	--L.giant_eye_tentacle_desc = "Timers for the giant eye tentacle."
 
 	--L.weakened_desc = "Warn for weakened state."
-	L.weakenedtrigger = "%s變弱了"
 
 	--L.dark_glare_message = "%s: %s (Group %s)" -- Dark Glare: PLAYER_NAME (Group 1)
 	--L.stomach = "Stomach"

AQ40/Viscidus.lua

@@ -62,6 +62,7 @@ function mod:OnBossEnable()
 	self:Log("SWING_DAMAGE", "SwingDamage", "*")
 
 	self:RegisterEvent("CHAT_MSG_MONSTER_EMOTE")
+	self:RegisterEvent("UNIT_TARGET")
 
 	self:Death("Win", 15299)
 end
@@ -95,17 +96,17 @@ 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)
+			if (frostCount <= 160 and frostCount % 20 == 0) or (frostCount > 160 and frostCount < 180) then
+				self:Message("freeze", "green", L.freeze_warn_frost:format(frostCount, 170-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)
+			if (swingCount < 90 and swingCount % 20 == 0) or (swingCount > 90 and swingCount < 130) then
+				self:Message("freeze", "green", L.freeze_warn_melee:format(swingCount, 100-swingCount), L.freeze_icon)
 			end
 		end
 	end
@@ -131,17 +132,23 @@ end
 
 function mod:CHAT_MSG_MONSTER_EMOTE(_, msg)
 	if msg:find(L.freeze_trigger1, nil, true) then
-		self:Message("freeze", "orange", L.freeze_warn1, L.freeze_icon)
+		self:Message("freeze", "orange", CL.count:format(L.freeze_warn1, frostCount), L.freeze_icon)
 	elseif msg:find(L.freeze_trigger2, nil, true) then
-		self:Message("freeze", "orange", L.freeze_warn2, L.freeze_icon)
+		self:Message("freeze", "orange", CL.count:format(L.freeze_warn2, frostCount), L.freeze_icon)
 	elseif msg:find(L.freeze_trigger3, nil, true) then
 		swingCount = 0
-		self:Message("freeze", "red", L.freeze_warn3, L.freeze_icon)
+		self:Message("freeze", "red", CL.count:format(L.freeze_warn3, frostCount), L.freeze_icon)
 		self:Bar("freeze", 30, L.freeze_warn3, L.freeze_icon)
-		self:ScheduleTimer("OnWipe", 27) -- Reset the frostCount
 	elseif msg:find(L.freeze_trigger4, nil, true) then
-		self:Message("freeze", "orange", L.freeze_warn4, L.freeze_icon)
+		self:Message("freeze", "orange", CL.count:format(L.freeze_warn4, swingCount), L.freeze_icon)
 	elseif msg:find(L.freeze_trigger5, nil, true) then
-		self:Message("freeze", "red", L.freeze_warn5, L.freeze_icon)
+		self:Message("freeze", "red", CL.count:format(L.freeze_warn5, swingCount), L.freeze_icon)
+	end
+end
+
+function mod:UNIT_TARGET(_, unit)
+	if self:MobId(self:UnitGUID(unit.."target")) == 15667 then -- Glob of Viscidus
+		swingCount = -1
+		frostCount = 0
 	end
 end

BlackwingLair/Vaelastrasz.lua

@@ -56,7 +56,7 @@ end
 
 function mod:CHAT_MSG_MONSTER_YELL(_, msg)
 	if msg:find(L.warmup_trigger, nil, true) then
-		self:Bar("warmup", self:Vanilla() and 45 or 43.5, CL.active, "inv_misc_monsterscales_05")
+		self:Bar("warmup", 43.5, CL.active, "inv_misc_monsterscales_05") -- Can vary up to 45s
 	end
 end