Updates and cleanups for classic

MoltenCore/BaronGeddon.lua

@@ -11,7 +11,7 @@ mod:SetEncounterID(668)
 -- Initialization
 --
 
-local livingBombMarker = mod:AddMarkerOption(true, "player", 8, 20475, 8, 7, 6) -- Living Bomb
+local livingBombMarker = mod:GetSeason() == 2 and mod:AddMarkerOption(true, "player", 8, 20475, 8, 7, 6) or mod:AddMarkerOption(true, "player", 8, 20475, 8) -- Living Bomb
 function mod:GetOptions()
 	return {
 		{20475, "SAY", "SAY_COUNTDOWN", "ME_ONLY_EMPHASIZE"}, -- Living Bomb

MoltenCore/Locales/deDE.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "deDE")
 if not L then return end
 if L then
-	L.submerge_trigger = "KOMMT HERBEI, MEINE DIENER"
-
 	L.son = "Sohn der Flamme" -- NPC ID 12143
 end
 

MoltenCore/Locales/esES.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "esES")
 if not L then return end
 if L then
-	L.submerge_trigger = "¡SIERVOS, A MÍ!"
-
 	L.son = "Hijo de la llama" -- NPC ID 12143
 end
 

MoltenCore/Locales/esMX.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "esMX")
 if not L then return end
 if L then
-	L.submerge_trigger = "¡AVANCEN, MIS SIRVIENTES!"
-
 	L.son = "Hijo de la llama" -- NPC ID 12143
 end
 

MoltenCore/Locales/frFR.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "frFR")
 if not L then return end
 if L then
-	L.submerge_trigger = "VENEZ, MES SERVITEURS"
-
 	L.son = "Fils des flammes" -- NPC ID 12143
 end
 

MoltenCore/Locales/itIT.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "itIT")
 if not L then return end
 if L then
-	--L.submerge_trigger = "COME FORTH,"
-
 	L.son = "Figlio delle Fiamme" -- NPC ID 12143
 end
 

MoltenCore/Locales/koKR.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "koKR")
 if not L then return end
 if L then
-	L.submerge_trigger = "나의 종들아"
-
 	L.son = "화염의 피조물" -- NPC ID 12143
 end
 

MoltenCore/Locales/ptBR.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "ptBR")
 if not L then return end
 if L then
-	L.submerge_trigger = "VENHAM, MEUS SERVOS"
-
 	L.son = "Filho das Chamas" -- NPC ID 12143
 end
 

MoltenCore/Locales/ruRU.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "ruRU")
 if not L then return end
 if L then
-	L.submerge_trigger = "ПРИБЫВАЙТЕ ЕЩЕ"
-
 	L.son = "Сын пламени" -- NPC ID 12143
 end
 

MoltenCore/Locales/zhCN.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "zhCN")
 if not L then return end
 if L then
-	L.submerge_trigger = "出现吧，我的奴仆"
-
 	L.son = "烈焰之子" -- NPC ID 12143
 end
 

MoltenCore/Locales/zhTW.lua

@@ -1,8 +1,6 @@
 local L = BigWigs:NewBossLocale("Ragnaros Classic", "zhTW")
 if not L then return end
 if L then
-	L.submerge_trigger = "出現吧，我的奴僕"
-
 	--L.son = "Son of Flame" -- NPC ID 12143
 end
 

MoltenCore/Magmadar.lua

@@ -74,13 +74,10 @@ end
 -- Event Handlers
 --
 
-do
-	local prev = 0
-	function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, castGUID, spellId)
-		if spellId == 461131 and not castCollector[castGUID] then -- Summon Core Hound
-			castCollector[castGUID] = true
-			self:Sync("sum")
-		end
+function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, castGUID, spellId)
+	if (spellId == 461131 or spellId == 364727) and not castCollector[castGUID] then -- Summon Core Hound (Level 2+3, 1)
+		castCollector[castGUID] = true
+		self:Sync("sum")
 	end
 end
 

MoltenCore/Ragnaros.lua

@@ -21,10 +21,11 @@ mod:SetStage(1)
 
 local sonsDead = 0
 local timer = nil
-local warmupTimer = mod:Retail() and 74 or mod:GetSeason() == 2 and 85 or 83
+local warmupTimer = mod:Retail() and 74 or mod:GetSeason() == 2 and 86 or 83
 local sonsTracker = {}
 local sonsMarker = 8
 local lineCount = 3
+local castCollector = {}
 local UpdateInfoBoxList
 
 --------------------------------------------------------------------------------
@@ -33,8 +34,6 @@ local UpdateInfoBoxList
 
 local L = mod:GetLocale()
 if L then
-	L.submerge_trigger = "COME FORTH,"
-
 	L.warmup_icon = "Achievement_boss_ragnaros"
 	L.adds_icon = "spell_fire_elemental_totem"
 
@@ -73,7 +72,6 @@ function mod:VerifyEnable(unit, mobId)
 end
 
 function mod:OnBossEnable()
-	self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
 	self:RegisterMessage("BigWigs_BossComm")
 
 	self:Log("SPELL_CAST_SUCCESS", "WrathOfRagnaros", 20566)
@@ -90,7 +88,9 @@ function mod:OnEngage()
 	sonsTracker = {}
 	sonsMarker = 8
 	lineCount = 3
+	castCollector = {}
 	self:SetStage(1)
+	self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
 	self:CDBar(20566, 26, CL.knockback) -- Wrath of Ragnaros
 	if self:GetSeason() == 2 then -- He doesn't submerge until 50% on SoD
 		self:RegisterEvent("UNIT_HEALTH")
@@ -104,9 +104,10 @@ end
 -- Event Handlers
 --
 
-function mod:CHAT_MSG_MONSTER_YELL(_, msg)
-	if msg:find(L.submerge_trigger, nil, true) then
-		self:Submerge()
+function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, castGUID, spellId)
+	if spellId == 20567 and not castCollector[castGUID] then -- Ragnaros Submerge Visual
+		castCollector[castGUID] = true
+		self:Sync("s2")
 	end
 end
 
@@ -121,17 +122,26 @@ function mod:SummonRagnarosStart()
 end
 
 do
-	local prev = 0
+	local times = {
+		["RagWarmup"] = 0,
+		["s2"] = 0,
+	}
 	function mod:BigWigs_BossComm(_, msg)
-		local t = GetTime()
-		if msg == "RagWarmup" and t - prev > 20 and not self:IsEngaged() then
-			prev = t
-			self:Bar("warmup", warmupTimer, CL.active, L.warmup_icon)
+		if times[msg] then
+			local t = GetTime()
+			if t-times[msg] > 60 then
+				times[msg] = t
+				if msg == "RagWarmup" and not self:IsEngaged() then
+					self:Bar("warmup", warmupTimer, CL.active, L.warmup_icon)
+				elseif msg == "s2" and self:IsEngaged() and self:GetStage() == 1 then
+					self:Submerge()
+				end
+			end
 		end
 	end
 
 	function mod:SummonRagnaros()
-		prev = GetTime()+100 -- No more sync allowed
+		times.RagWarmup = GetTime()+100 -- No more sync allowed
 		self:Bar("warmup", {warmupTimer-10, warmupTimer}, CL.active, L.warmup_icon)
 	end
 end

MoltenCore/Sulfuron.lua

@@ -19,10 +19,28 @@ function mod:GetOptions()
 	}
 end
 
+if mod:GetSeason() == 2 then
+	function mod:GetOptions()
+		return {
+			19779, -- Inspire
+			19775, -- Dark Mending
+			19778, -- Demoralizing Shout
+			461103, -- Living Fallout
+		},nil,{
+			[461103] = CL.underyou:format(CL.fire), -- Living Fallout (Fire under YOU)
+		}
+	end
+end
+
 function mod:OnBossEnable()
 	self:Log("SPELL_CAST_SUCCESS", "Inspire", 19779)
 	self:Log("SPELL_CAST_SUCCESS", "DemoralizingShout", 19778)
 	self:Log("SPELL_CAST_START", "DarkMending", 19775)
+	if self:GetSeason() == 2  then
+		self:Log("SPELL_AURA_APPLIED", "LivingFalloutDamage", 461103)
+		self:Log("SPELL_PERIODIC_DAMAGE", "LivingFalloutDamage", 461103)
+		self:Log("SPELL_PERIODIC_MISSED", "LivingFalloutDamage", 461103)
+	end
  end
 
 --------------------------------------------------------------------------------
@@ -55,3 +73,14 @@ function mod:DarkMending(args)
 		end
 	end
 end
+
+do
+	local prev = 0
+	function mod:LivingFalloutDamage(args)
+		if self:Me(args.destGUID) and args.time - prev > 2 then
+			prev = args.time
+			self:PersonalMessage(args.spellId, "underyou", CL.fire)
+			self:PlaySound(args.spellId, "underyou")
+		end
+	end
+end