Updates and cleanups for classic

BigWigsMods · Aug 16, 2024 · 0dc29d4 · 0dc29d4
1 parent 40c54c2
commit 0dc29d4
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 29 deletions.
diff --git a/BlackwingLair/Chromaggus.lua b/BlackwingLair/Chromaggus.lua
@@ -185,6 +185,9 @@ end
 function mod:BroodAfflictionRemoved(args)
 	if self:Me(args.destGUID) then
 		debuffCount = debuffCount - 1
+		if args.spellId == 23170 then -- Brood Affliction: Bronze
+			self:PersonalMessage(23170, "removed", L.bronze)
+		end
 	end
 end
 

diff --git a/BlackwingLair/Locales/deDE.lua b/BlackwingLair/Locales/deDE.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "deDE")
 if L then
 	--L.engage_yell_trigger = "Let the games begin"
-	L.stage2_yell_trigger = "BRENNT! Ihr Elenden!"
 	L.stage3_yell_trigger = "Unmöglich! Erhebt euch"
 
 	L.shaman_class_call_yell_trigger = "Schamane, zeigt mir was"

diff --git a/BlackwingLair/Locales/esES.lua b/BlackwingLair/Locales/esES.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "esES")
 if L then
 	--L.engage_yell_trigger = "Let the games begin"
-	--L.stage2_yell_trigger = "BURN! You wretches"
 	L.stage3_yell_trigger = "¡Imposible! ¡Levantaos, esbirros!"
 
 	L.shaman_class_call_yell_trigger = "Chamanes"

diff --git a/BlackwingLair/Locales/esMX.lua b/BlackwingLair/Locales/esMX.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "esMX")
 if L then
 	L.engage_yell_trigger = "¡Que comiencen los juegos!"
-	--L.stage2_yell_trigger = "BURN! You wretches"
 	L.stage3_yell_trigger = "¡Imposible! ¡Levántense, mis esbirros!"
 
 	L.shaman_class_call_yell_trigger = "Chamanes"

diff --git a/BlackwingLair/Locales/frFR.lua b/BlackwingLair/Locales/frFR.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "frFR")
 if L then
 	L.engage_yell_trigger = "Que les jeux commencent"
-	L.stage2_yell_trigger = "BRÛLEZ, misérables"
 	L.stage3_yell_trigger = "C'est impossible"
 
 	L.shaman_class_call_yell_trigger = "Chamans, montrez moi"

diff --git a/BlackwingLair/Locales/itIT.lua b/BlackwingLair/Locales/itIT.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "itIT")
 if L then
 	--L.engage_yell_trigger = "Let the games begin"
-	--L.stage2_yell_trigger = "BURN! You wretches"
 	--L.stage3_yell_trigger = "Impossible! Rise my"
 
 	--L.shaman_class_call_yell_trigger = "Shamans"

diff --git a/BlackwingLair/Locales/koKR.lua b/BlackwingLair/Locales/koKR.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "koKR")
 if L then
 	--L.engage_yell_trigger = "Let the games begin"
-	L.stage2_yell_trigger = "불타라! 활활!"
 	L.stage3_yell_trigger = "말도 안 돼! 일어나라!"
 
 	L.shaman_class_call_yell_trigger = "주술사"

diff --git a/BlackwingLair/Locales/ptBR.lua b/BlackwingLair/Locales/ptBR.lua
@@ -34,7 +34,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "ptBR")
 if L then
 	L.engage_yell_trigger = "Que comecem os jogos!"
-	--L.stage2_yell_trigger = "BURN! You wretches"
 	L.stage3_yell_trigger = "Impossível! Ergam-se, meus lacaios!"
 
 	L.shaman_class_call_yell_trigger = "Xamãs"

diff --git a/BlackwingLair/Locales/ruRU.lua b/BlackwingLair/Locales/ruRU.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "ruRU")
 if L then
 	--L.engage_yell_trigger = "Let the games begin"
-	L.stage2_yell_trigger = "СЖЕЧЬ! Вы обречены!"
 	L.stage3_yell_trigger = "Невозможно!"
 
 	L.shaman_class_call_yell_trigger = "Шаманы! Покажитесь мне!"

diff --git a/BlackwingLair/Locales/zhCN.lua b/BlackwingLair/Locales/zhCN.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "zhCN")
 if L then
 	L.engage_yell_trigger = "比赛现在开始"
-	L.stage2_yell_trigger = "燃烧吧！"
 	L.stage3_yell_trigger = "不可能"
 
 	L.shaman_class_call_yell_trigger = "萨满祭司"

diff --git a/BlackwingLair/Locales/zhTW.lua b/BlackwingLair/Locales/zhTW.lua
@@ -33,7 +33,6 @@ end
 L = BigWigs:NewBossLocale("Nefarian Classic", "zhTW")
 if L then
 	--L.engage_yell_trigger = "Let the games begin"
-	L.stage2_yell_trigger = "燃燒吧！一群廢物！燒吧！"
 	L.stage3_yell_trigger = "不可能！來吧，我的僕人！再次為你們的主人服務！"
 
 	L.shaman_class_call_yell_trigger = "薩滿，讓我看看你圖騰到底是什麼用處的"

diff --git a/BlackwingLair/Nefarian.lua b/BlackwingLair/Nefarian.lua
@@ -24,7 +24,6 @@ local adds_dead = 0
 local L = mod:GetLocale()
 if L then
 	L.engage_yell_trigger = "Let the games begin"
-	L.stage2_yell_trigger = "BURN! You wretches"
 	L.stage3_yell_trigger = "Impossible! Rise my"
 
 	L.shaman_class_call_yell_trigger = "Shamans"
@@ -75,10 +74,10 @@ function mod:GetOptions()
 end
 
 function mod:VerifyEnable(unit, mobId)
-	if mobId == 11583 then -- Nefarian
-		return true
-	else -- Lord Victor Nefarius, prevent enabling at Vael
+	if mobId == 10162 then -- Lord Victor Nefarius, prevent enabling at Vael
 		return self:UnitIsInteractable(unit)
+	else -- Nefarian, adds
+		return true
 	end
 end
 
@@ -194,10 +193,6 @@ end
 function mod:CHAT_MSG_MONSTER_YELL(_, msg)
 	if msg:find(L.engage_yell_trigger, nil, true) then
 		self:Engage()
-	elseif msg:find(L.stage2_yell_trigger, nil, true) then
-		self:SetStage(2)
-		self:Message("stages", "cyan", CL.stage:format(2), false)
-		self:PlaySound("stages", "info")
 	elseif msg:find(L.stage3_yell_trigger, nil, true) then
 		self:SetStage(3)
 		self:Message("stages", "cyan", CL.percent:format(20, CL.stage:format(3)), false)
@@ -213,12 +208,20 @@ function mod:CHAT_MSG_MONSTER_YELL(_, msg)
 	end
 end
 
-function mod:AddDied()
-	adds_dead = adds_dead + 1
-	self:Message("add", "green", CL.add_killed:format(adds_dead, 41), "INV_Misc_Head_Dragon_Black")
-	if adds_dead == 41 then
-		self:Message("stages", "cyan", CL.custom_sec:format(CL.stage:format(2), 10), false)
-		self:Bar("stages", 11, CL.stage:format(2), "INV_Misc_Head_Dragon_Black")
-		self:PlaySound("stages", "long")
+do
+	local function Stage2(self)
+		self:SetStage(2)
+		self:Message("stages", "cyan", CL.stage:format(2), false)
+		self:PlaySound("stages", "info")
+	end
+	function mod:AddDied()
+		adds_dead = adds_dead + 1
+		self:Message("add", "green", CL.add_killed:format(adds_dead, 41), "INV_Misc_Head_Dragon_Black")
+		if adds_dead == 41 then
+			self:Message("stages", "cyan", CL.custom_sec:format(CL.stage:format(2), 12), false)
+			self:Bar("stages", 12, CL.stage:format(2), "INV_Misc_Head_Dragon_Black")
+			self:ScheduleTimer(Stage2, 12, self)
+			self:PlaySound("stages", "long")
+		end
 	end
 end
diff --git a/Gnomeregan_Classic/MechanicalMenagerie.lua b/Gnomeregan_Classic/MechanicalMenagerie.lua
@@ -118,8 +118,7 @@ function mod:OnEngage()
 end
 
 function mod:OnWin()
-	self:Message("run", "blue", L.run, false)
-	self:SimpleTimer(function() self:Message("run", "blue", L.run, false) end, 1)
+	self:Message("run", "blue", L.run, false, nil, 3)
 end
 
 --------------------------------------------------------------------------------

diff --git a/MoltenCore/TheMoltenCore.lua b/MoltenCore/TheMoltenCore.lua
@@ -32,6 +32,7 @@ if L then
 	L.custom_on_linked_spam_desc = CL.link_say_option_desc
 	L.custom_on_linked_spam_icon = mod:GetMenuIcon("SAY")
 
+	L["460883_icon"] = "inv_elemental_primal_fire"
 	L.adds_icon = "spell_fire_elemental_totem"
 end
 
@@ -50,6 +51,7 @@ function mod:GetOptions()
 		"custom_on_linked_spam",
 		460887, -- Harmonic Tremor
 		{460885, "CASTBAR", "EMPHASIZE", "CASTBAR_COUNTDOWN"}, -- Doomsday
+		460883, -- Meteor
 		{"health", "INFOBOX"},
 		"adds",
 	},nil,{
@@ -80,6 +82,7 @@ function mod:OnBossEnable()
 	self:Log("SPELL_DAMAGE", "SpellDamage", "*")
 	self:Death("FirefighterDeaths", 228820)
 	self:Log("SPELL_CAST_SUCCESS", "ConjureFlame", 462619)
+	self:Log("SPELL_CAST_SUCCESS", "Meteor", 460883, 462778, 462779, 462780) -- 1, 2, 3, 4
 end
 
 function mod:OnEngage()
@@ -118,6 +121,7 @@ do
 		if self:Me(args.destGUID) then
 			heartOfAshOnMe = false
 			self:Say(args.spellId, CL.link_removed, true, "Link removed")
+			self:PersonalMessage(args.spellId, false, CL.link_removed)
 		end
 		self:CustomIcon(heartOfAshMarker, args.destName)
 	end
@@ -148,6 +152,7 @@ do
 		mySaySpamTarget = nil -- Sometimes only one of the two has a removed event (player death?) so just nil it for everyone
 		if self:Me(args.destGUID) then
 			self:Say(args.spellId, CL.link_removed, true, "Link removed")
+			self:PersonalMessage(args.spellId, false, CL.link_removed)
 		end
 		self:CustomIcon(heartOfCinderMarker, args.destName)
 	end
@@ -221,7 +226,7 @@ function mod:FirefighterDeaths(args)
 		local line = tbl[1]
 		self:SetInfoBar("health", line, 0)
 		self:SetInfo("health", line + 1, CL.dead)
-		if not next(tbl) then
+		if not next(firefighters) then
 			self:StopBar(CL.adds)
 		end
 	end
@@ -232,3 +237,16 @@ function mod:ConjureFlame()
 	self:Message("adds", "cyan", CL.adds_spawned, L.adds_icon)
 	self:PlaySound("adds", "info")
 end
+
+function mod:Meteor(args)
+	if args.spellId == 462778 then -- 2 Meteors
+		self:Message(460883, "red", CL.count:format(args.spellName, 2), L["460883_icon"])
+	elseif args.spellId == 462779 then -- 3 Meteors
+		self:Message(460883, "red", CL.count:format(args.spellName, 3), L["460883_icon"])
+	elseif args.spellId == 462780 then -- 4 Meteors
+		self:Message(460883, "red", CL.count:format(args.spellName, 4), L["460883_icon"])
+	else -- 460883, 1 Meteor
+		self:Message(460883, "red", CL.count:format(args.spellName, 1), L["460883_icon"])
+	end
+	self:PlaySound(460883, "alert")
+end
diff --git a/Onyxia_Classic/Onyxia.lua b/Onyxia_Classic/Onyxia.lua
@@ -142,7 +142,7 @@ do
 	local sourceGUID = nil
 	local targetGUID = nil
 	local function scanTarget()
-		if targetGUID and sourceGUID then
+		if targetGUID and sourceGUID and mod:IsEngaged() and mod:GetStage() == 2 then
 			local unit = mod:GetUnitIdByGUID(sourceGUID)
 			if unit then
 				local newTargetGUID = mod:UnitGUID(unit.."target")