Skip to content

Commit

Permalink
MoltenCore: Merge separate modules into unified ones, updates, cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
funkydude committed Dec 17, 2023
1 parent 4297ef4 commit 1e1710f
Show file tree
Hide file tree
Showing 48 changed files with 337 additions and 1,290 deletions.
2 changes: 1 addition & 1 deletion BigWigs_Classic_TBC.toc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
## X-Wago-ID: rNkPgm6a
## X-BigWigs-LoadOn-InstanceId: 409, 469, 509, 531, 533, 309, 249

MoltenCore_Classic\modules.xml
MoltenCore\modules.xml
BlackwingLair_Classic\modules.xml
AhnQirajRuins_Classic\modules.xml
AhnQirajTemple_Classic\modules.xml
Expand Down
2 changes: 1 addition & 1 deletion BigWigs_Classic_Vanilla.toc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
## X-BigWigs-ExtraMenu: -947
## X-BigWigs-LoadOn-WorldBoss: -1447, 6109, -1419, 12397, -1440, 14889, -1425, 14888, -1431, 14890, -1444, 14887

MoltenCore_Classic\modules.xml
MoltenCore\modules.xml
BlackwingLair_Classic\modules.xml
AhnQirajRuins_Classic\modules.xml
AhnQirajTemple_Classic\modules.xml
Expand Down
2 changes: 1 addition & 1 deletion BigWigs_Classic_Wrath.toc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
## X-Wago-ID: rNkPgm6a
## X-BigWigs-LoadOn-InstanceId: 409, 469, 509, 531, 309

MoltenCore_Classic\modules.xml
MoltenCore\modules.xml
BlackwingLair_Classic\modules.xml
AhnQirajRuins_Classic\modules.xml
AhnQirajTemple_Classic\modules.xml
Expand Down
56 changes: 39 additions & 17 deletions MoltenCore/BaronGeddon.lua
Original file line number Diff line number Diff line change
@@ -1,56 +1,78 @@

--------------------------------------------------------------------------------
-- Module declaration
-- Module Declaration
--

local mod = BigWigs:NewBoss("Baron Geddon", 409, 1524)
local mod, CL = BigWigs:NewBoss("Baron Geddon", 409, 1524)
if not mod then return end
mod:RegisterEnableMob(12056)
mod.toggleOptions = {{20475, "FLASH", "ICON", "PROXIMITY", "SAY"}, 19695, 20478}
mod:SetEncounterID(668)

--------------------------------------------------------------------------------
-- Initialization
--

function mod:OnBossEnable()
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
function mod:GetOptions()
return {
{20475, "ICON", "SAY", "SAY_COUNTDOWN", "ME_ONLY_EMPHASIZE"}, -- Living Bomb
{19695, "CASTBAR"}, -- Inferno
20478, -- Armageddon
19659, -- Ignite Mana
},nil,{
[20475] = CL.bomb, -- Living Bomb (Bomb)
}
end

function mod:OnBossEnable()
self:Log("SPELL_AURA_APPLIED", "LivingBomb", 20475)
self:Log("SPELL_AURA_REMOVED", "LivingBombRemoved", 20475)
self:Log("SPELL_CAST_SUCCESS", "Inferno", 19695)
self:Log("SPELL_CAST_SUCCESS", "Armageddon", 20478)
self:Log("SPELL_CAST_SUCCESS", "IgniteMana", 19659)

self:Death("Win", 12056)
end

function mod:OnEngage()
self:CDBar(19659, 6) -- Ignite Mana
end

--------------------------------------------------------------------------------
-- Event Handlers
--

function mod:LivingBomb(args)
if self:Me(args.destGUID) then
self:Flash(args.spellId)
self:OpenProximity(args.spellId, 9)
self:Say(args.spellId)
else
self:OpenProximity(args.spellId, 9, args.destName)
self:Say(args.spellId, CL.bomb, nil, "Bomb")
self:SayCountdown(args.spellId, 8)
end
self:TargetMessageOld(args.spellId, args.destName, "blue", "alarm")
self:TargetMessage(args.spellId, "red", args.destName, CL.bomb)
self:TargetBar(args.spellId, 8, args.destName, CL.bomb)
self:PrimaryIcon(args.spellId, args.destName)
self:TargetBar(args.spellId, 8, args.destName)
self:PlaySound(args.spellId, "warning")
end

function mod:LivingBombRemoved(args)
self:CloseProximity(args.spellId)
if self:Me(args.destGUID) then
self:CancelSayCountdown(args.spellId)
end
self:PrimaryIcon(args.spellId)
self:StopBar(CL.bomb, args.destName)
end

function mod:Inferno(args)
self:MessageOld(args.spellId, "red", "long")
self:Bar(args.spellId, 8)
self:Message(args.spellId, "red")
self:PlaySound(args.spellId, "long")
self:CastBar(args.spellId, 8)
self:CDBar(args.spellId, 21) -- 21-29
end

function mod:Armageddon(args)
self:Bar(args.spellId, 8)
self:MessageOld(args.spellId, "orange")
self:Message(args.spellId, "orange")
end

function mod:IgniteMana(args)
self:CDBar(args.spellId, 27)
self:Message(args.spellId, "yellow")
self:PlaySound(args.spellId, "info")
end
13 changes: 8 additions & 5 deletions MoltenCore/Garr.lua
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@

--------------------------------------------------------------------------------
-- Module declaration
-- Module Declaration
--

local mod = BigWigs:NewBoss("Garr", 409, 1522)
if not mod then return end
mod:RegisterEnableMob(12057)
mod.toggleOptions = {19492}
mod:SetEncounterID(666)

--------------------------------------------------------------------------------
-- Initialization
--

function mod:OnBossEnable()
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
function mod:GetOptions()
return {
19492, -- Antimagic Pulse
}
end

function mod:OnBossEnable()
self:Log("SPELL_CAST_SUCCESS", "Pulse", 19492)

self:Death("Win", 12057)
Expand All @@ -27,4 +31,3 @@ end
function mod:Pulse(args)
self:Bar(args.spellId, 18)
end

38 changes: 23 additions & 15 deletions MoltenCore/Gehennas.lua
Original file line number Diff line number Diff line change
@@ -1,40 +1,48 @@

--------------------------------------------------------------------------------
-- Module declaration
-- Module Declaration
--

local mod, CL = BigWigs:NewBoss("Gehennas", 409, 1521)
if not mod then return end
mod:RegisterEnableMob(12259)
mod.toggleOptions = {19716, {19717, "FLASH"}}
mod:SetEncounterID(665)

--------------------------------------------------------------------------------
-- Initialization
--

function mod:OnBossEnable()
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
function mod:GetOptions()
return {
19716, -- Gehennas' Curse
19717, -- Rain of Fire
},nil,{
[19716] = CL.curse, -- Gehennas' Curse (Curse)
}
end

self:Log("SPELL_CAST_SUCCESS", "Curse", 19716)
self:Log("SPELL_AURA_APPLIED", "Fire", 19717)
function mod:OnBossEnable()
self:Log("SPELL_CAST_SUCCESS", "GehennasCurse", 19716)
self:Log("SPELL_AURA_APPLIED", "RainOfFire", 19717)

self:Death("Win", 12259)
end

function mod:OnEngage()
self:CDBar(19716, 6, CL.curse) -- Gehennas' Curse
end

--------------------------------------------------------------------------------
-- Event Handlers
--

function mod:Curse(args)
self:Bar(args.spellId, 30)
self:MessageOld(args.spellId, "orange")
self:DelayedMessage(args.spellId, 25, "yellow", CL.custom_sec:format(args.spellName, 5))
function mod:GehennasCurse(args)
self:CDBar(args.spellId, 27, CL.curse) -- 27-37
self:Message(args.spellId, "orange", CL.curse)
end

function mod:Fire(args)
function mod:RainOfFire(args)
if self:Me(args.destGUID) then
self:Flash(args.spellId)
self:MessageOld(args.spellId, "blue", "alarm", CL.you:format(args.spellName))
self:PersonalMessage(args.spellId, "aboveyou")
self:PlaySound(args.spellId, "underyou")
end
end

21 changes: 17 additions & 4 deletions MoltenCore/Golemagg.lua
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@

--------------------------------------------------------------------------------
-- Module declaration
-- Module Declaration
--

local mod = BigWigs:NewBoss("Golemagg the Incinerator", 409, 1526)
if not mod then return end
mod:RegisterEnableMob(11988)
mod.toggleOptions = {}
mod:SetEncounterID(670)

--------------------------------------------------------------------------------
-- Initialization
--

function mod:GetOptions()
return {
13880, -- Magma Splash
}
end

function mod:OnBossEnable()
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Log("SPELL_AURA_APPLIED_DOSE", "MagmaSplashApplied", 13880)

self:Death("Win", 11988)
end
Expand All @@ -22,3 +27,11 @@ function mod:OnBossEnable()
-- Event Handlers
--

function mod:MagmaSplashApplied(args)
if self:Player(args.destFlags) and args.amount >= 3 then -- Players, not pets
self:StackMessage(args.spellId, "purple", args.destName, args.amount, 3)
if self:Me(args.destGUID) then
self:PlaySound(args.spellId, "info")
end
end
end
5 changes: 1 addition & 4 deletions MoltenCore/Locales/deDE.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local L = BigWigs:NewBossLocale("Lucifron", "deDE")
if not L then return end
if L then
--L.mc_bar = "MC: %s"
L.mc_bar = "GK"
end

L = BigWigs:NewBossLocale("Majordomo Executus", "deDE")
Expand All @@ -15,9 +15,6 @@ if L then
L.submerge_trigger = "KOMMT HERBEI, MEINE DIENER"
L.engage_trigger = "NUN ZU EUCH, INSEKTEN"

--L.knockback_message = "Knockback!"
--L.knockback_bar = "Knockback"

L.submerge = "Untertauchen"
L.submerge_desc = "Warnt, wenn Ragnaros untertaucht."
L.submerge_message = "Ragnaros untergetaucht für 90 sek!"
Expand Down
5 changes: 1 addition & 4 deletions MoltenCore/Locales/esES.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local L = BigWigs:NewBossLocale("Lucifron", "esES")
if not L then return end
if L then
--L.mc_bar = "MC: %s"
L.mc_bar = "CM"
end

L = BigWigs:NewBossLocale("Majordomo Executus", "esES")
Expand All @@ -15,9 +15,6 @@ if L then
--L.engage_trigger = "NOW FOR YOU,"
--L.submerge_trigger = "COME FORTH,"

--L.knockback_message = "Knockback!"
--L.knockback_bar = "Knockback"

--L.submerge = "Submerge"
--L.submerge_desc = "Warn for Ragnaros' submerge."
--L.submerge_message = "Ragnaros down for 90 sec!"
Expand Down
5 changes: 1 addition & 4 deletions MoltenCore/Locales/esMX.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local L = BigWigs:NewBossLocale("Lucifron", "esMX")
if not L then return end
if L then
--L.mc_bar = "MC: %s"
L.mc_bar = "CM"
end

L = BigWigs:NewBossLocale("Majordomo Executus", "esMX")
Expand All @@ -15,9 +15,6 @@ if L then
--L.engage_trigger = "NOW FOR YOU,"
--L.submerge_trigger = "COME FORTH,"

--L.knockback_message = "Knockback!"
--L.knockback_bar = "Knockback"

--L.submerge = "Submerge"
--L.submerge_desc = "Warn for Ragnaros' submerge."
--L.submerge_message = "Ragnaros down for 90 sec!"
Expand Down
5 changes: 1 addition & 4 deletions MoltenCore/Locales/frFR.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local L = BigWigs:NewBossLocale("Lucifron", "frFR")
if not L then return end
if L then
L.mc_bar = "CM : %s"
L.mc_bar = "CM"
end

L = BigWigs:NewBossLocale("Majordomo Executus", "frFR")
Expand All @@ -15,9 +15,6 @@ if L then
L.submerge_trigger = "VENEZ, MES SERVITEURS"
L.engage_trigger = "ET MAINTENANT"

L.knockback_message = "Projection de zone !"
L.knockback_bar = "Projection de zone"

L.submerge = "Immersion"
L.submerge_desc = "Préviens quand Ragnaros plonge et l'arrivée des Fils des flammes."
L.submerge_message = "Ragnaros intouchable pendant 90 sec. Arrivée des Fils des flammes !"
Expand Down
5 changes: 1 addition & 4 deletions MoltenCore/Locales/itIT.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local L = BigWigs:NewBossLocale("Lucifron", "itIT")
if not L then return end
if L then
--L.mc_bar = "MC: %s"
L.mc_bar = "CM"
end

L = BigWigs:NewBossLocale("Majordomo Executus", "itIT")
Expand All @@ -15,9 +15,6 @@ if L then
--L.engage_trigger = "NOW FOR YOU,"
--L.submerge_trigger = "COME FORTH,"

--L.knockback_message = "Knockback!"
--L.knockback_bar = "Knockback"

--L.submerge = "Submerge"
--L.submerge_desc = "Warn for Ragnaros' submerge."
--L.submerge_message = "Ragnaros down for 90 sec!"
Expand Down
5 changes: 1 addition & 4 deletions MoltenCore/Locales/koKR.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local L = BigWigs:NewBossLocale("Lucifron", "koKR")
if not L then return end
if L then
L.mc_bar = "정배: %s"
L.mc_bar = "정배"
end

L = BigWigs:NewBossLocale("Majordomo Executus", "koKR")
Expand All @@ -15,9 +15,6 @@ if L then
L.submerge_trigger = "나의 종들아"
L.engage_trigger = "이제 너희"

L.knockback_message = "광역 튕겨냄!"
L.knockback_bar = "광역 튕겨냄"

L.submerge = "사라짐 경고"
L.submerge_desc = "라그나로스 사라짐 & 피조물에 대한 경고"
L.submerge_message = "90초간 라그나로스 사라짐. 피조물 등장!"
Expand Down
5 changes: 1 addition & 4 deletions MoltenCore/Locales/ptBR.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local L = BigWigs:NewBossLocale("Lucifron", "ptBR")
if not L then return end
if L then
--L.mc_bar = "MC: %s"
L.mc_bar = "CM"
end

L = BigWigs:NewBossLocale("Majordomo Executus", "ptBR")
Expand All @@ -15,9 +15,6 @@ if L then
--L.engage_trigger = "NOW FOR YOU,"
--L.submerge_trigger = "COME FORTH,"

--L.knockback_message = "Knockback!"
--L.knockback_bar = "Knockback"

--L.submerge = "Submerge"
--L.submerge_desc = "Warn for Ragnaros' submerge."
--L.submerge_message = "Ragnaros down for 90 sec!"
Expand Down
Loading

0 comments on commit 1e1710f

Please sign in to comment.