Skip to content

Commit

Permalink
MoltenCore/Ragnaros: Fix subsequent submerge messages stating 50%, br…
Browse files Browse the repository at this point in the history
…ing back backup submerge event
  • Loading branch information
funkydude committed Aug 19, 2024
1 parent ba89573 commit dc6043e
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 1 deletion.
1 change: 1 addition & 0 deletions MoltenCore/Locales/deDE.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/esES.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/esMX.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/frFR.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/itIT.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/koKR.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/ptBR.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/ruRU.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/zhCN.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
1 change: 1 addition & 0 deletions MoltenCore/Locales/zhTW.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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

Expand Down
18 changes: 17 additions & 1 deletion MoltenCore/Ragnaros.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ local sonsTracker = {}
local sonsMarker = 8
local lineCount = 3
local castCollector = {}
local firstSubmerge = true
local UpdateInfoBoxList

--------------------------------------------------------------------------------
Expand All @@ -37,6 +38,7 @@ if L then
L.warmup_icon = "Achievement_boss_ragnaros"
L.adds_icon = "spell_fire_elemental_totem"

L.submerge_trigger = "COME FORTH,"
L.son = "Son of Flame" -- NPC ID 12143
end

Expand Down Expand Up @@ -91,6 +93,8 @@ end
function mod:OnBossEnable()
self:RegisterMessage("BigWigs_BossComm")

self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
self:Log("SPELL_CAST_SUCCESS", "RagnarosSubmergeVisual", 20567)
self:Log("SPELL_CAST_SUCCESS", "WrathOfRagnaros", 20566)
self:Log("SPELL_CAST_START", "SummonRagnarosStart", 19774)
self:Log("SPELL_CAST_SUCCESS", "SummonRagnaros", 19774)
Expand All @@ -112,6 +116,7 @@ function mod:OnEngage()
sonsMarker = 8
lineCount = 3
castCollector = {}
firstSubmerge = true
self:SetStage(1)
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
self:CDBar(20566, 26, CL.knockback) -- Wrath of Ragnaros
Expand All @@ -127,6 +132,16 @@ end
-- Event Handlers
--

function mod:CHAT_MSG_MONSTER_YELL(_, msg)
if msg:find(L.submerge_trigger, nil, true) then
self:Sync("s2")
end
end

function mod:RagnarosSubmergeVisual()
self:Sync("s2")
end

function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, castGUID, spellId)
if spellId == 20567 and not castCollector[castGUID] then -- Ragnaros Submerge Visual
castCollector[castGUID] = true
Expand Down Expand Up @@ -208,7 +223,8 @@ function mod:Submerge()
self:SetStage(2)
timer = self:ScheduleTimer("Emerge", 90)
self:StopBar(CL.knockback)
if self:GetSeason() == 2 then
if self:GetSeason() == 2 and firstSubmerge then
firstSubmerge = false
self:Message("stages", "cyan", CL.percent:format(50, CL.stage:format(2)), L.warmup_icon)
else
self:Message("stages", "cyan", CL.stage:format(2), L.warmup_icon)
Expand Down

0 comments on commit dc6043e

Please sign in to comment.