From 1e1710fc9bd9499614036801c8e8b76246d3b8b8 Mon Sep 17 00:00:00 2001 From: funkydude Date: Sun, 17 Dec 2023 18:36:48 +0000 Subject: [PATCH] MoltenCore: Merge separate modules into unified ones, updates, cleanups --- BigWigs_Classic_TBC.toc | 2 +- BigWigs_Classic_Vanilla.toc | 2 +- BigWigs_Classic_Wrath.toc | 2 +- MoltenCore/BaronGeddon.lua | 56 ++++++--- MoltenCore/Garr.lua | 13 +- MoltenCore/Gehennas.lua | 38 +++--- MoltenCore/Golemagg.lua | 21 +++- MoltenCore/Locales/deDE.lua | 5 +- MoltenCore/Locales/esES.lua | 5 +- MoltenCore/Locales/esMX.lua | 5 +- MoltenCore/Locales/frFR.lua | 5 +- MoltenCore/Locales/itIT.lua | 5 +- MoltenCore/Locales/koKR.lua | 5 +- MoltenCore/Locales/ptBR.lua | 5 +- MoltenCore/Locales/ruRU.lua | 5 +- MoltenCore/Locales/zhCN.lua | 5 +- MoltenCore/Locales/zhTW.lua | 5 +- MoltenCore/Lucifron.lua | 69 ++++++++--- MoltenCore/Magmadar.lua | 46 ++++--- MoltenCore/Majordomo.lua | 55 ++++++--- MoltenCore/Ragnaros.lua | 107 +++++++++-------- MoltenCore/Shazzrah.lua | 60 +++++++--- MoltenCore/Sulfuron.lua | 23 ++-- MoltenCore_Classic/BaronGeddon.lua | 72 ----------- MoltenCore_Classic/Garr.lua | 31 ----- MoltenCore_Classic/Gehennas.lua | 43 ------- MoltenCore_Classic/Golemagg.lua | 27 ----- MoltenCore_Classic/Locales/deDE.lua | 32 ----- MoltenCore_Classic/Locales/esES.lua | 32 ----- MoltenCore_Classic/Locales/esMX.lua | 32 ----- MoltenCore_Classic/Locales/frFR.lua | 32 ----- MoltenCore_Classic/Locales/itIT.lua | 32 ----- MoltenCore_Classic/Locales/koKR.lua | 32 ----- MoltenCore_Classic/Locales/locales.xml | 15 --- MoltenCore_Classic/Locales/ptBR.lua | 32 ----- MoltenCore_Classic/Locales/ruRU.lua | 32 ----- MoltenCore_Classic/Locales/zhCN.lua | 32 ----- MoltenCore_Classic/Locales/zhTW.lua | 32 ----- MoltenCore_Classic/Lucifron.lua | 62 ---------- MoltenCore_Classic/Magmadar.lua | 54 --------- MoltenCore_Classic/Majordomo.lua | 78 ------------ MoltenCore_Classic/Options/Colors.lua | 53 -------- MoltenCore_Classic/Options/Sounds.lua | 42 ------- MoltenCore_Classic/Options/options.xml | 7 -- MoltenCore_Classic/Ragnaros.lua | 160 ------------------------- MoltenCore_Classic/Shazzrah.lua | 55 --------- MoltenCore_Classic/Sulfuron.lua | 46 ------- MoltenCore_Classic/modules.xml | 18 --- 48 files changed, 337 insertions(+), 1290 deletions(-) delete mode 100644 MoltenCore_Classic/BaronGeddon.lua delete mode 100644 MoltenCore_Classic/Garr.lua delete mode 100644 MoltenCore_Classic/Gehennas.lua delete mode 100644 MoltenCore_Classic/Golemagg.lua delete mode 100644 MoltenCore_Classic/Locales/deDE.lua delete mode 100644 MoltenCore_Classic/Locales/esES.lua delete mode 100644 MoltenCore_Classic/Locales/esMX.lua delete mode 100644 MoltenCore_Classic/Locales/frFR.lua delete mode 100644 MoltenCore_Classic/Locales/itIT.lua delete mode 100644 MoltenCore_Classic/Locales/koKR.lua delete mode 100644 MoltenCore_Classic/Locales/locales.xml delete mode 100644 MoltenCore_Classic/Locales/ptBR.lua delete mode 100644 MoltenCore_Classic/Locales/ruRU.lua delete mode 100644 MoltenCore_Classic/Locales/zhCN.lua delete mode 100644 MoltenCore_Classic/Locales/zhTW.lua delete mode 100644 MoltenCore_Classic/Lucifron.lua delete mode 100644 MoltenCore_Classic/Magmadar.lua delete mode 100644 MoltenCore_Classic/Majordomo.lua delete mode 100644 MoltenCore_Classic/Options/Colors.lua delete mode 100644 MoltenCore_Classic/Options/Sounds.lua delete mode 100644 MoltenCore_Classic/Options/options.xml delete mode 100644 MoltenCore_Classic/Ragnaros.lua delete mode 100644 MoltenCore_Classic/Shazzrah.lua delete mode 100644 MoltenCore_Classic/Sulfuron.lua delete mode 100644 MoltenCore_Classic/modules.xml diff --git a/BigWigs_Classic_TBC.toc b/BigWigs_Classic_TBC.toc index 3b5e706..aa6831b 100644 --- a/BigWigs_Classic_TBC.toc +++ b/BigWigs_Classic_TBC.toc @@ -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 diff --git a/BigWigs_Classic_Vanilla.toc b/BigWigs_Classic_Vanilla.toc index 43fb980..6ee9d98 100644 --- a/BigWigs_Classic_Vanilla.toc +++ b/BigWigs_Classic_Vanilla.toc @@ -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 diff --git a/BigWigs_Classic_Wrath.toc b/BigWigs_Classic_Wrath.toc index d7b4f8f..2d6ccaa 100644 --- a/BigWigs_Classic_Wrath.toc +++ b/BigWigs_Classic_Wrath.toc @@ -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 diff --git a/MoltenCore/BaronGeddon.lua b/MoltenCore/BaronGeddon.lua index 9feed68..63c557b 100644 --- a/MoltenCore/BaronGeddon.lua +++ b/MoltenCore/BaronGeddon.lua @@ -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 diff --git a/MoltenCore/Garr.lua b/MoltenCore/Garr.lua index e497717..dcbc15e 100644 --- a/MoltenCore/Garr.lua +++ b/MoltenCore/Garr.lua @@ -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) @@ -27,4 +31,3 @@ end function mod:Pulse(args) self:Bar(args.spellId, 18) end - diff --git a/MoltenCore/Gehennas.lua b/MoltenCore/Gehennas.lua index 7a4bcf7..6aac251 100644 --- a/MoltenCore/Gehennas.lua +++ b/MoltenCore/Gehennas.lua @@ -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 - diff --git a/MoltenCore/Golemagg.lua b/MoltenCore/Golemagg.lua index 02e8e2d..3afbdc7 100644 --- a/MoltenCore/Golemagg.lua +++ b/MoltenCore/Golemagg.lua @@ -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 @@ -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 diff --git a/MoltenCore/Locales/deDE.lua b/MoltenCore/Locales/deDE.lua index bc4f1ef..bc02333 100644 --- a/MoltenCore/Locales/deDE.lua +++ b/MoltenCore/Locales/deDE.lua @@ -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") @@ -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!" diff --git a/MoltenCore/Locales/esES.lua b/MoltenCore/Locales/esES.lua index c9da471..ce94381 100644 --- a/MoltenCore/Locales/esES.lua +++ b/MoltenCore/Locales/esES.lua @@ -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") @@ -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!" diff --git a/MoltenCore/Locales/esMX.lua b/MoltenCore/Locales/esMX.lua index e024942..1034dd4 100644 --- a/MoltenCore/Locales/esMX.lua +++ b/MoltenCore/Locales/esMX.lua @@ -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") @@ -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!" diff --git a/MoltenCore/Locales/frFR.lua b/MoltenCore/Locales/frFR.lua index 523975c..287bb39 100644 --- a/MoltenCore/Locales/frFR.lua +++ b/MoltenCore/Locales/frFR.lua @@ -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") @@ -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 !" diff --git a/MoltenCore/Locales/itIT.lua b/MoltenCore/Locales/itIT.lua index 8514115..21f99d7 100644 --- a/MoltenCore/Locales/itIT.lua +++ b/MoltenCore/Locales/itIT.lua @@ -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") @@ -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!" diff --git a/MoltenCore/Locales/koKR.lua b/MoltenCore/Locales/koKR.lua index 003b029..0f82ff0 100644 --- a/MoltenCore/Locales/koKR.lua +++ b/MoltenCore/Locales/koKR.lua @@ -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") @@ -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초간 라그나로스 사라짐. 피조물 등장!" diff --git a/MoltenCore/Locales/ptBR.lua b/MoltenCore/Locales/ptBR.lua index 6a63c98..8ab7e7c 100644 --- a/MoltenCore/Locales/ptBR.lua +++ b/MoltenCore/Locales/ptBR.lua @@ -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") @@ -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!" diff --git a/MoltenCore/Locales/ruRU.lua b/MoltenCore/Locales/ruRU.lua index d25d33c..0371f36 100644 --- a/MoltenCore/Locales/ruRU.lua +++ b/MoltenCore/Locales/ruRU.lua @@ -1,7 +1,7 @@ local L = BigWigs:NewBossLocale("Lucifron", "ruRU") if not L then return end if L then - L.mc_bar = "КР: %s" + L.mc_bar = "КР" end L = BigWigs:NewBossLocale("Majordomo Executus", "ruRU") @@ -15,9 +15,6 @@ if L then L.submerge_trigger = "ПРИБЫВАЙТЕ ЕЩЕ" L.engage_trigger = "Тогда получите ещё!" - L.knockback_message = "Сбивание с ног!" - L.knockback_bar = "Массовое cбивание с ног" - L.submerge = "Погружение Рагнароса" L.submerge_desc = "Предупреждать о погружении Рагнароса и появлении сыновей пламени" L.submerge_message = "Раграрос погрузился на 90 секунд. Появляются сыновья пламени!" diff --git a/MoltenCore/Locales/zhCN.lua b/MoltenCore/Locales/zhCN.lua index 2f7857d..4427313 100644 --- a/MoltenCore/Locales/zhCN.lua +++ b/MoltenCore/Locales/zhCN.lua @@ -1,7 +1,7 @@ local L = BigWigs:NewBossLocale("Lucifron", "zhCN") if not L then return end if L then - L.mc_bar = "控制：%s" + L.mc_bar = "控制" end L = BigWigs:NewBossLocale("Majordomo Executus", "zhCN") @@ -15,9 +15,6 @@ if L then L.engage_trigger = "现在轮到你们了" L.submerge_trigger = "出现吧，我的奴仆" - L.knockback_message = "群体击退！" - L.knockback_bar = "群体击退" - L.submerge = "消失" L.submerge_desc = "当拉格纳罗斯消失时发出警报。" L.submerge_message = "拉格纳罗斯消失90秒！" diff --git a/MoltenCore/Locales/zhTW.lua b/MoltenCore/Locales/zhTW.lua index bb32e98..efccc31 100644 --- a/MoltenCore/Locales/zhTW.lua +++ b/MoltenCore/Locales/zhTW.lua @@ -1,7 +1,7 @@ local L = BigWigs:NewBossLocale("Lucifron", "zhTW") if not L then return end if L then - L.mc_bar = "控制：%s" + L.mc_bar = "控制" end L = BigWigs:NewBossLocale("Majordomo Executus", "zhTW") @@ -15,9 +15,6 @@ if L then L.engage_trigger = "現在輪到你們了" L.submerge_trigger = "出現吧，我的奴僕" - L.knockback_message = "群體擊退！" - L.knockback_bar = "群體擊退" - L.submerge = "消失" L.submerge_desc = "當拉格納羅斯消失時發出警報" L.submerge_message = "消失 90 秒！ 烈焰之子出現！" diff --git a/MoltenCore/Lucifron.lua b/MoltenCore/Lucifron.lua index 2729c28..8fbd35e 100644 --- a/MoltenCore/Lucifron.lua +++ b/MoltenCore/Lucifron.lua @@ -1,40 +1,58 @@ - -------------------------------------------------------------------------------- --- Module declaration +-- Module Declaration -- -local mod = BigWigs:NewBoss("Lucifron", 409, 1519) +local mod, CL = BigWigs:NewBoss("Lucifron", 409, 1519) if not mod then return end mod:RegisterEnableMob(12118) -mod.toggleOptions = {19702, 19703, {20604, "ICON"}} +mod:SetEncounterID(663) + +-------------------------------------------------------------------------------- +-- Locals +-- + +local assignMarks = {} -------------------------------------------------------------------------------- -- Localization -- -local L = mod:NewLocale("enUS", true) +local L = mod:NewLocale() if L then - L.mc_bar = "MC: %s" + L.mc_bar = "MC" end -L = mod:GetLocale() -------------------------------------------------------------------------------- -- Initialization -- -function mod:OnBossEnable() - self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus") +local dominateMindMarker = mod:AddMarkerOption(true, "player", 1, 20604, 1, 2) -- Dominate Mind +function mod:GetOptions() + return { + 19702, -- Impending Doom + 19703, -- Lucifron's Curse + 20604, -- Dominate Mind + dominateMindMarker, + },nil,{ + [19703] = CL.curse, -- Lucifron's Curse (Curse) + [20604] = L.mc_bar, -- Dominate Mind (MC) + } +end +function mod:OnBossEnable() self:Log("SPELL_CAST_SUCCESS", "ImpendingDoom", 19702) self:Log("SPELL_CAST_SUCCESS", "LucifronsCurse", 19703) - self:Log("SPELL_AURA_APPLIED", "MindControl", 20604) + self:Log("SPELL_CAST_START", "DominateMind", 20604) + self:Log("SPELL_AURA_APPLIED", "DominateMindApplied", 20604) + self:Log("SPELL_AURA_REMOVED", "DominateMindRemoved", 20604) self:Death("Win", 12118) end function mod:OnEngage() - self:Bar(19703, 11) -- Lucifron's Curse - self:Bar(19702, 13) -- Impending Doom + assignMarks = {} + self:CDBar(19702, 8) -- Impending Doom + self:CDBar(19703, 11, CL.curse) -- Lucifron's Curse end -------------------------------------------------------------------------------- @@ -43,17 +61,30 @@ end function mod:ImpendingDoom(args) self:CDBar(args.spellId, 20) - self:MessageOld(args.spellId, "red") + self:Message(args.spellId, "red") + self:PlaySound(args.spellId, "long") end function mod:LucifronsCurse(args) - self:Bar(args.spellId, 20) - self:MessageOld(args.spellId, "yellow") + self:Bar(args.spellId, 20, CL.curse) + self:Message(args.spellId, "yellow", CL.curse) + self:PlaySound(args.spellId, "info") end -function mod:MindControl(args) - self:Bar(args.spellId, 15, L.mc_bar:format(args.destName)) - self:TargetMessageOld(args.spellId, args.destName, "yellow") - self:PrimaryIcon(args.spellId, args.destName) +function mod:DominateMind(args) + if not assignMarks[args.sourceGUID] then -- Each add gets its own marker it applies to players + assignMarks[args.sourceGUID] = next(assignMarks) and 2 or 1 + end end +function mod:DominateMindApplied(args) + self:TargetBar(args.spellId, 15, args.destName, L.mc_bar) + self:TargetMessage(args.spellId, "orange", args.destName) + self:CustomIcon(dominateMindMarker, args.destName, assignMarks[args.sourceGUID]) + self:PlaySound(args.spellId, "warning") +end + +function mod:DominateMindRemoved(args) + self:CustomIcon(dominateMindMarker, args.destName) + self:StopBar(L.mc_bar, args.destName) +end diff --git a/MoltenCore/Magmadar.lua b/MoltenCore/Magmadar.lua index 3a97ce6..97679ce 100644 --- a/MoltenCore/Magmadar.lua +++ b/MoltenCore/Magmadar.lua @@ -1,30 +1,36 @@ - -------------------------------------------------------------------------------- --- Module declaration +-- Module Declaration -- local mod, CL = BigWigs:NewBoss("Magmadar", 409, 1520) if not mod then return end mod:RegisterEnableMob(11982) -mod.toggleOptions = {19408, 19451, 19428} +mod:SetEncounterID(664) -------------------------------------------------------------------------------- -- Initialization -- -function mod:OnBossEnable() - self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus") +function mod:GetOptions() + return { + 19408, -- Panic + 19451, -- Enrage / Frenzy (different name on classic era) + 19428, -- Conflagration + } +end +function mod:OnBossEnable() self:Log("SPELL_CAST_SUCCESS", "Panic", 19408) - self:Log("SPELL_CAST_SUCCESS", "Enrage", 19451) + self:Log("SPELL_CAST_SUCCESS", "EnrageFrenzy", 19451) + self:Log("SPELL_DISPEL", "EnrageFrenzyDispelled", "*") self:Log("SPELL_AURA_APPLIED", "Conflagration", 19428) self:Death("Win", 11982) end function mod:OnEngage() - self:Bar(19451, 8.5) -- Enrage - self:Bar(19408, 9.7) -- Panic + self:CDBar(19451, 8.1) -- Enrage / Frenzy + self:CDBar(19408, 9.7) -- Panic end -------------------------------------------------------------------------------- @@ -32,18 +38,28 @@ end -- function mod:Panic(args) - self:CDBar(args.spellId, 31) -- 31-38 - self:MessageOld(args.spellId, "green") + self:CDBar(args.spellId, 31) -- 31-50, sometimes even higher + self:Message(args.spellId, "orange") + self:PlaySound(args.spellId, "long") end -function mod:Enrage(args) - self:Bar(args.spellId, 8, CL.cast:format(args.spellName)) - self:MessageOld(args.spellId, "yellow", "info") +function mod:EnrageFrenzy(args) + self:TargetBar(args.spellId, 8, args.destName) + self:CDBar(args.spellId, 18) -- 18-21 + self:Message(args.spellId, "yellow", CL.buff_boss:format(args.spellName)) + self:PlaySound(args.spellId, "info") +end + +function mod:EnrageFrenzyDispelled(args) + if args.extraSpellId == 19451 then + self:StopBar(args.extraSpellName, args.destName) + self:Message(19451, "green", CL.removed_by:format(args.extraSpellName, self:ColorName(args.sourceName))) + end end function mod:Conflagration(args) if self:Me(args.destGUID) then - self:MessageOld(args.spellId, "blue", "alert", CL.underyou:format(args.spellName)) + self:PersonalMessage(args.spellId, "underyou") + self:PlaySound(args.spellId, "underyou") end end - diff --git a/MoltenCore/Majordomo.lua b/MoltenCore/Majordomo.lua index b081bc3..88558e1 100644 --- a/MoltenCore/Majordomo.lua +++ b/MoltenCore/Majordomo.lua @@ -1,56 +1,79 @@ - -------------------------------------------------------------------------------- --- Module declaration +-- Module Declaration -- local mod, CL = BigWigs:NewBoss("Majordomo Executus", 409, 1527) if not mod then return end mod:RegisterEnableMob(12018, 11663, 11664) -mod.toggleOptions = {20619, 21075} +mod:SetEncounterID(671) -------------------------------------------------------------------------------- -- Localization -- -local L = mod:NewLocale("enUS", true) +local L = mod:NewLocale() if L then L.disabletrigger = "Impossible! Stay your attack, mortals... I submit! I submit!" L.power_next = "Next Power" end -L = mod:GetLocale() -------------------------------------------------------------------------------- -- Initialization -- +function mod:GetOptions() + return { + 20619, -- Magic Reflection + 21075, -- Damage Shield + 20534, -- Teleport + } +end + +function mod:VerifyEnable(unit) + return (UnitIsEnemy(unit, "player") and UnitCanAttack(unit, "player")) and true or false +end + function mod:OnBossEnable() - self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus") + self:RegisterEvent("CHAT_MSG_MONSTER_YELL") self:Log("SPELL_CAST_SUCCESS", "MagicReflection", 20619) self:Log("SPELL_CAST_SUCCESS", "DamageShield", 21075) - - self:BossYell("Win", L.disabletrigger) + self:Log("SPELL_CAST_SUCCESS", "Teleport", 20534) end -function mod:VerifyEnable(unit) - return (UnitIsEnemy(unit, "player") and UnitCanAttack(unit, "player")) and true or false +function mod:OnEngage() + self:CDBar(20534, 20) -- Teleport + self:Bar(self:CheckOption(20619, "BAR") and 20619 or 21075, 27, L.power_next, "ability_warlock_improvedsoulleech") + self:DelayedMessage(self:CheckOption(20619, "MESSAGE") and 20619 or 21075, 22, "orange", CL.custom_sec:format(L.power_next, 5)) end -------------------------------------------------------------------------------- -- Event Handlers -- +function mod:CHAT_MSG_MONSTER_YELL(_, msg) + if msg:find(L.disabletrigger, nil, true) then + self:Win() + end +end + function mod:MagicReflection(args) self:Bar(args.spellId, 10) - self:MessageOld(args.spellId, "red", "info") - self:Bar(args.spellId, 30, L.power_next, "ability_warlock_improvedsoulleech") - self:DelayedMessage(args.spellId, 25, "orange", CL.custom_sec:format(L.power_next, 5)) + self:Message(args.spellId, "red") + self:PlaySound(args.spellId, "info") + self:Bar(self:CheckOption(20619, "BAR") and 20619 or 21075, 30, L.power_next, "ability_warlock_improvedsoulleech") + self:DelayedMessage(self:CheckOption(20619, "MESSAGE") and 20619 or 21075, 25, "orange", CL.custom_sec:format(L.power_next, 5)) end function mod:DamageShield(args) self:Bar(args.spellId, 10) - self:MessageOld(args.spellId, "red", "info") - self:Bar(args.spellId, 30, L.power_next, "ability_warlock_improvedsoulleech") - self:DelayedMessage(args.spellId, 25, "orange", CL.custom_sec:format(L.power_next, 5)) + self:Message(args.spellId, "red") + self:PlaySound(args.spellId, "info") + self:Bar(self:CheckOption(20619, "BAR") and 20619 or 21075, 30, L.power_next, "ability_warlock_improvedsoulleech") + self:DelayedMessage(self:CheckOption(20619, "MESSAGE") and 20619 or 21075, 25, "orange", CL.custom_sec:format(L.power_next, 5)) end +function mod:Teleport(args) + self:TargetMessage(args.spellId, "yellow", args.destName) + self:CDBar(args.spellId, 25) -- 25-30 +end diff --git a/MoltenCore/Ragnaros.lua b/MoltenCore/Ragnaros.lua index 5c33362..4c3d3c8 100644 --- a/MoltenCore/Ragnaros.lua +++ b/MoltenCore/Ragnaros.lua @@ -1,75 +1,81 @@ - -------------------------------------------------------------------------------- --- Module declaration +-- Module Declaration -- -local mod, CL = BigWigs:NewBoss("Ragnaros ", 409, 1528) -- Space is intentional to prevent conflict with Ragnaros from Firelands +local mod, CL = BigWigs:NewBoss("Ragnaros Classic", 409, 1528) if not mod then return end mod:RegisterEnableMob(11502, 12018) -mod.toggleOptions = {"submerge", "emerge", "warmup", 20566} +mod:SetEncounterID(672) -------------------------------------------------------------------------------- -- Locals -- local sonsdead = 0 +local timer = nil -------------------------------------------------------------------------------- -- Localization -- -local L = mod:NewLocale("enUS", true) +local L = mod:NewLocale() 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_icon = "misc_arrowdown" + L.submerge_icon = "Achievement_boss_ragnaros" L.submerge_message = "Ragnaros down for 90 sec!" L.submerge_bar = "Submerge" L.emerge = "Emerge" L.emerge_desc = "Warn for Ragnaros' emerge." - L.emerge_icon = "misc_arrowlup" + L.emerge_icon = "Achievement_boss_ragnaros" L.emerge_message = "Ragnaros emerged, 3 mins until submerge!" L.emerge_bar = "Emerge" end -L = mod:GetLocale() -------------------------------------------------------------------------------- -- Initialization -- -function mod:OnBossEnable() - --self:BossYell("Engage", L.engage_trigger) - --self:BossYell("Submerge", L.submerge_trigger) +function mod:GetOptions() + return { + "warmup", + "submerge", + "emerge", + 20566, -- Wrath of Ragnaros + },nil,{ + [20566] = CL.knockback, -- Wrath of Ragnaros (Knockback) + } +end + +function mod:VerifyEnable(unit, mobId) + if mobId == 11502 then + return true + elseif mobId == 12018 then + return not UnitCanAttack(unit, "player") + end +end - self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus") +function mod:OnBossEnable() + self:RegisterEvent("CHAT_MSG_MONSTER_YELL") - self:Log("SPELL_CAST_SUCCESS", "Knockback", 20566) - self:Log("SPELL_CAST_START", "Warmup", 19774) -- Summon Ragnaros + self:Log("SPELL_CAST_SUCCESS", "WrathOfRagnaros", 20566) + self:Log("SPELL_CAST_SUCCESS", "SummonRagnaros", 19774) - self:RegisterUnitEvent("UNIT_TARGETABLE_CHANGED", nil, "boss1") self:Death("Win", 11502) self:Death("SonDeaths", 12143) self:Death("MajordomoDeath", 12018) end -function mod:VerifyEnable(unit, mobId) - if mobId == 11502 or (mobId == 12018 and not UnitCanAttack(unit, "player")) then - return true - end -end - function mod:OnEngage() sonsdead = 0 - self:CDBar(20566, 27, L.knockback_bar) -- guesstimate for the first wrath - self:Bar("submerge", 180, L.submerge_bar, "misc_arrowdown") - self:MessageOld("submerge", "yellow", nil, CL.custom_min:format(L.submerge, 3), "misc_arrowdown") + timer = nil + self:CDBar(20566, 27, CL.knockback) -- Wrath of Ragnaros + self:Bar("submerge", 180, L.submerge_bar, "Achievement_boss_ragnaros") + self:Message("submerge", "yellow", CL.custom_min:format(L.submerge, 3), "Achievement_boss_ragnaros") self:DelayedMessage("submerge", 60, "yellow", CL.custom_min:format(L.submerge, 2)) self:DelayedMessage("submerge", 120, "yellow", CL.custom_min:format(L.submerge, 1)) self:DelayedMessage("submerge", 150, "yellow", CL.custom_sec:format(L.submerge, 30)) @@ -81,26 +87,36 @@ end -- Event Handlers -- -function mod:Knockback(args) - self:MessageOld(args.spellId, "red", nil, L.knockback_message) - self:Bar(args.spellId, 28, L.knockback_bar) +function mod:CHAT_MSG_MONSTER_YELL(_, msg) + if msg:find(L.engage_trigger, nil, true) then + self:Engage() + elseif msg:find(L.submerge_trigger, nil, true) then + self:Submerge() + end +end + +function mod:WrathOfRagnaros(args) + self:Message(args.spellId, "red", CL.knockback) + self:Bar(args.spellId, 28, CL.knockback) end -function mod:Warmup(args) - self:Bar("warmup", 73, CL.active, args.spellId) --"spell_fire_lavaspawn" +function mod:SummonRagnaros() + self:Bar("warmup", 73, CL.active, "Achievement_boss_ragnaros") end function mod:MajordomoDeath() -- it takes exactly 10 seconds for combat to start after Majodromo dies, while -- the time between starting the RP/summon and killing Majordomo varies - self:Bar("warmup", 10, CL.active, 19774) --"spell_fire_lavaspawn" + self:Bar("warmup", {10, 73}, CL.active, "Achievement_boss_ragnaros") end function mod:Emerge() sonsdead = 10 -- Block this firing again if sons are killed after he emerges - self:CDBar(20566, 27, L.knockback_bar) -- guesstimate for the first wrath - self:MessageOld("emerge", "yellow", "long", L.emerge_message, "misc_arrowlup") - self:Bar("submerge", 180, L.submerge_bar, "misc_arrowdown") + timer = nil + self:CDBar(20566, 27, CL.knockback) + self:Bar("submerge", 180, L.submerge_bar, "Achievement_boss_ragnaros") + self:Message("emerge", "yellow", L.emerge_message, "Achievement_boss_ragnaros") + self:PlaySound("emerge", "long") self:DelayedMessage("submerge", 60, "yellow", CL.custom_min:format(L.submerge, 2)) self:DelayedMessage("submerge", 120, "yellow", CL.custom_min:format(L.submerge, 1)) self:DelayedMessage("submerge", 150, "yellow", CL.custom_sec:format(L.submerge, 30)) @@ -110,34 +126,29 @@ end function mod:Submerge() sonsdead = 0 -- reset counter - self:StopBar(L.knockback_bar) - self:MessageOld("submerge", "yellow", "long", L.submerge_message, "misc_arrowdown") - self:Bar("emerge", 90, L.emerge_bar, "misc_arrowlup") + self:StopBar(CL.knockback) + self:Message("submerge", "yellow", L.submerge_message, "Achievement_boss_ragnaros") + self:PlaySound("submerge", "long") + self:Bar("emerge", 90, L.emerge_bar, "Achievement_boss_ragnaros") self:DelayedMessage("emerge", 30, "yellow", CL.custom_sec:format(L.emerge, 60)) self:DelayedMessage("emerge", 60, "yellow", CL.custom_sec:format(L.emerge, 30)) self:DelayedMessage("emerge", 80, "orange", CL.custom_sec:format(L.emerge, 10), false, "alarm") self:DelayedMessage("emerge", 85, "orange", CL.custom_sec:format(L.emerge, 5), false, "alarm") + timer = self:ScheduleTimer("Emerge", 90) end function mod:SonDeaths() sonsdead = sonsdead + 1 if sonsdead < 9 then - self:MessageOld("emerge", "green", nil, CL.add_killed:format(sonsdead, 8), "spell_fire_elemental_totem") + self:Message("emerge", "green", CL.add_killed:format(sonsdead, 8), "spell_fire_elemental_totem") end if sonsdead == 8 then + self:CancelTimer(timer) self:StopBar(L.emerge_bar) self:CancelDelayedMessage(CL.custom_sec:format(L.emerge, 60)) self:CancelDelayedMessage(CL.custom_sec:format(L.emerge, 30)) self:CancelDelayedMessage(CL.custom_sec:format(L.emerge, 10)) self:CancelDelayedMessage(CL.custom_sec:format(L.emerge, 5)) - end -end - -function mod:UNIT_TARGETABLE_CHANGED(_, unit) - if UnitCanAttack("player", unit) then self:Emerge() - else - self:Submerge() end end - diff --git a/MoltenCore/Shazzrah.lua b/MoltenCore/Shazzrah.lua index 1b48755..e09452f 100644 --- a/MoltenCore/Shazzrah.lua +++ b/MoltenCore/Shazzrah.lua @@ -1,47 +1,77 @@ - -------------------------------------------------------------------------------- --- Module declaration +-- Module Declaration -- local mod, CL = BigWigs:NewBoss("Shazzrah", 409, 1523) if not mod then return end mod:RegisterEnableMob(12264) -mod.toggleOptions = {19714, 23138, 19715} +mod:SetEncounterID(667) -------------------------------------------------------------------------------- -- Initialization -- -function mod:OnBossEnable() - self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus") +function mod:GetOptions() + return { + 19714, -- Magic Grounding / Deaden Magic (different name on classic era) + 23138, -- Gate of Shazzrah + 19715, -- Counterspell + 19713, -- Shazzrah's Curse + },nil,{ + [23138] = CL.teleport, -- Gate of Shazzrah (Teleport) + [19713] = CL.curse, -- Shazzrah's Curse (Curse) + } +end - self:Log("SPELL_CAST_SUCCESS", "Blink", 23138) - self:Log("SPELL_CAST_SUCCESS", "MagicGrounding", 19714) +function mod:OnBossEnable() + self:Log("SPELL_CAST_SUCCESS", "GateOfShazzrah", 23138) + self:Log("SPELL_AURA_APPLIED", "MagicGroundingDeadenMagicApplied", 19714) + self:Log("SPELL_DISPEL", "MagicGroundingDeadenMagicDispelled", "*") self:Log("SPELL_CAST_SUCCESS", "Counterspell", 19715) + self:Log("SPELL_CAST_SUCCESS", "ShazzrahsCurse", 19713) self:Death("Win", 12264) end function mod:OnEngage() - self:Bar(19715, 10.7) -- Counterspell + self:CDBar(19713, 6.4, CL.curse) -- Shazzrah's Curse + self:CDBar(19715, 9.7) -- Counterspell + self:CDBar(23138, 30, CL.teleport) -- Gate of Shazzrah end -------------------------------------------------------------------------------- -- Event Handlers -- -function mod:Blink(args) - self:Bar(args.spellId, 45) - self:MessageOld(args.spellId, "red") +function mod:GateOfShazzrah(args) + self:CDBar(args.spellId, 41, CL.teleport) -- 41-50 + self:Message(args.spellId, "red", CL.teleport) + self:PlaySound(args.spellId, "long") end -function mod:MagicGrounding(args) - -- Self buff - self:MessageOld(args.spellId, "orange", self:Dispeller("magic", true) and "alarm", CL.onboss:format(args.spellName)) +function mod:MagicGroundingDeadenMagicApplied(args) + self:Message(args.spellId, "orange", CL.buff_boss:format(args.spellName)) + if self:Dispeller("magic", true) then + self:PlaySound(args.spellId, "warning") + end +end + +function mod:MagicGroundingDeadenMagicDispelled(args) + if args.extraSpellId == 19714 then + self:Message(19714, "green", CL.removed_by:format(args.extraSpellName, self:ColorName(args.sourceName))) + end end function mod:Counterspell(args) self:CDBar(args.spellId, 15) -- 15-19 - self:MessageOld(args.spellId, "yellow", "info") + self:Message(args.spellId, "yellow") + self:PlaySound(args.spellId, "info") end +function mod:ShazzrahsCurse(args) + self:CDBar(args.spellId, 22.6, CL.curse) -- 22.6-25 + self:Message(args.spellId, "yellow", CL.curse) + if self:Dispeller("curse") then + self:PlaySound(args.spellId, "warning") + end +end diff --git a/MoltenCore/Sulfuron.lua b/MoltenCore/Sulfuron.lua index ae9c064..e1bac91 100644 --- a/MoltenCore/Sulfuron.lua +++ b/MoltenCore/Sulfuron.lua @@ -1,21 +1,25 @@ - -------------------------------------------------------------------------------- --- Module declaration +-- Module Declaration -- local mod = BigWigs:NewBoss("Sulfuron Harbinger", 409, 1525) if not mod then return end mod:RegisterEnableMob(12098) -mod.toggleOptions = {19779, 19775} +mod:SetEncounterID(669) -------------------------------------------------------------------------------- -- Initialization -- -function mod:OnBossEnable() - self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus") +function mod:GetOptions() + return { + 19779, -- Inspire + 19775, -- Dark Mending + } +end - self:Log("SPELL_CAST_START", "SulfuronHeal", 19775) +function mod:OnBossEnable() + self:Log("SPELL_CAST_START", "DarkMending", 19775) self:Log("SPELL_CAST_SUCCESS", "Inspire", 19779) self:Death("Win", 12098) @@ -27,18 +31,17 @@ function mod:OnBossEnable() function mod:Inspire(args) self:Bar(args.spellId, 10) - self:MessageOld(args.spellId, "yellow") + self:Message(args.spellId, "yellow") end do local prev = 0 - function mod:SulfuronHeal(args) + function mod:DarkMending(args) local t = GetTime() if t - prev > 1 then prev = t self:Bar(args.spellId, 2) - self:MessageOld(args.spellId, "red") + self:Message(args.spellId, "red") end end end - diff --git a/MoltenCore_Classic/BaronGeddon.lua b/MoltenCore_Classic/BaronGeddon.lua deleted file mode 100644 index 2f82136..0000000 --- a/MoltenCore_Classic/BaronGeddon.lua +++ /dev/null @@ -1,72 +0,0 @@ - --------------------------------------------------------------------------------- --- Module declaration --- - -local mod, CL = BigWigs:NewBoss("Baron Geddon", 409, 1524) -if not mod then return end -mod:RegisterEnableMob(12056) -mod:SetEncounterID(668) - --------------------------------------------------------------------------------- --- Initialization --- - -function mod:GetOptions() - return { - {20475, "FLASH", "ICON", "PROXIMITY", "SAY"}, -- Living Bomb - 19695, -- Inferno - 20478, -- Armageddon - 19659, -- Ignite Mana - } -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) -end - --------------------------------------------------------------------------------- --- Event Handlers --- - -function mod:LivingBomb(args) - if self:Me(args.destGUID) then - self:Flash(20475) - self:OpenProximity(20475, 9) - self:Say(20475) - else - self:OpenProximity(20475, 9, args.destName) - end - self:TargetMessage(20475, "blue", args.destName) - if self:Me(args.destGUID) then - self:PlaySound(20475, "alarm") - end - self:PrimaryIcon(20475, args.destName) - self:TargetBar(20475, 8, args.destName) -end - -function mod:LivingBombRemoved(args) - self:CloseProximity(20475) -end - -function mod:Inferno(args) - self:Message(19695, "red") - self:PlaySound(19695, "long") - self:Bar(19695, 8) -end - -function mod:Armageddon(args) - self:Bar(20478, 8) - self:Message(20478, "orange") -end - -function mod:IgniteMana(args) - -- first cast takes 7-19s, so we skip that - self:Bar(19659, 27) - self:Message(19659, "orange") - self:DelayedMessage(19659, 22, "red", CL.custom_sec:format(self:SpellName(19659), 5), false, "alert") -end diff --git a/MoltenCore_Classic/Garr.lua b/MoltenCore_Classic/Garr.lua deleted file mode 100644 index 011a6ee..0000000 --- a/MoltenCore_Classic/Garr.lua +++ /dev/null @@ -1,31 +0,0 @@ - --------------------------------------------------------------------------------- --- Module declaration --- - -local mod = BigWigs:NewBoss("Garr", 409, 1522) -if not mod then return end -mod:RegisterEnableMob(12057) -mod:SetEncounterID(666) - --------------------------------------------------------------------------------- --- Initialization --- - -function mod:GetOptions() - return { - 19492, -- Antimagic Pulse - } -end - -function mod:OnBossEnable() - self:Log("SPELL_CAST_SUCCESS", "Pulse", 19492) -end - --------------------------------------------------------------------------------- --- Event Handlers --- - -function mod:Pulse(args) - self:Bar(19492, 18) -end diff --git a/MoltenCore_Classic/Gehennas.lua b/MoltenCore_Classic/Gehennas.lua deleted file mode 100644 index 32ec077..0000000 --- a/MoltenCore_Classic/Gehennas.lua +++ /dev/null @@ -1,43 +0,0 @@ - --------------------------------------------------------------------------------- --- Module declaration --- - -local mod, CL = BigWigs:NewBoss("Gehennas", 409, 1521) -if not mod then return end -mod:RegisterEnableMob(12259) -mod:SetEncounterID(665) - --------------------------------------------------------------------------------- --- Initialization --- - -function mod:GetOptions() - return { - 19716, -- Gehennas' Curse - {19717, "FLASH"}, -- Rain of Fire - } -end - -function mod:OnBossEnable() - self:Log("SPELL_CAST_SUCCESS", "Curse", 19716) - self:Log("SPELL_AURA_APPLIED", "Fire", 19717) -end - --------------------------------------------------------------------------------- --- Event Handlers --- - -function mod:Curse(args) - self:Bar(19716, 30) - self:Message(19716, "orange") - self:DelayedMessage(19716, 25, "yellow", CL.custom_sec:format(args.spellName, 5)) -end - -function mod:Fire(args) - if self:Me(args.destGUID) then - self:Flash(19717) - self:Message(19717, "blue", CL.you:format(args.spellName)) - self:PlaySound(19717, "alarm") - end -end diff --git a/MoltenCore_Classic/Golemagg.lua b/MoltenCore_Classic/Golemagg.lua deleted file mode 100644 index 04172f2..0000000 --- a/MoltenCore_Classic/Golemagg.lua +++ /dev/null @@ -1,27 +0,0 @@ - --------------------------------------------------------------------------------- --- Module declaration --- - -local mod = BigWigs:NewBoss("Golemagg the Incinerator", 409, 1526) -if not mod then return end -mod:RegisterEnableMob(11988) -mod:SetEncounterID(670) - --------------------------------------------------------------------------------- --- Initialization --- - -function mod:GetOptions() - return { - --"stages", - } -end - -function mod:OnBossEnable() - end - --------------------------------------------------------------------------------- --- Event Handlers --- - diff --git a/MoltenCore_Classic/Locales/deDE.lua b/MoltenCore_Classic/Locales/deDE.lua deleted file mode 100644 index cb3b40f..0000000 --- a/MoltenCore_Classic/Locales/deDE.lua +++ /dev/null @@ -1,32 +0,0 @@ -local L = BigWigs:NewBossLocale("Lucifron", "deDE") -if not L then return end -if L then - --L.mc_bar = "MC: %s" -end - -L = BigWigs:NewBossLocale("Majordomo Executus", "deDE") -if L then - L.disabletrigger = "Haltet ein, Sterbliche" - L.power_next = "Nächste Fähigkeit" -end - -L = BigWigs:NewBossLocale("Ragnaros", "deDE") -if L then - L.warmup_message = "RP gestartet, aktiv in ~73s" - - L.engage_trigger = "NUN ZU EUCH, INSEKTEN" - L.submerge_trigger = "KOMMT HERBEI, MEINE DIENER" - - L.knockback_message = "Rückstoß!" - L.knockback_bar = "Rückstoß" - - L.submerge = "Untertauchen" - L.submerge_desc = "Warnt, wenn Ragnaros untertaucht." - L.submerge_message = "Ragnaros untergetaucht für 90 sek!" - L.submerge_bar = "Untertauchen" - - L.emerge = "Auftauchen" - L.emerge_desc = "Warnt, wenn Ragnaros auftaucht." - L.emerge_message = "Ragnaros aufgetaucht! Untertauchen in 3 min!" - L.emerge_bar = "Auftauchen" -end diff --git a/MoltenCore_Classic/Locales/esES.lua b/MoltenCore_Classic/Locales/esES.lua deleted file mode 100644 index 14a9388..0000000 --- a/MoltenCore_Classic/Locales/esES.lua +++ /dev/null @@ -1,32 +0,0 @@ -local L = BigWigs:NewBossLocale("Lucifron", "esES") -if not L then return end -if L then - --L.mc_bar = "MC: %s" -end - -L = BigWigs:NewBossLocale("Majordomo Executus", "esES") -if L then - --L.disabletrigger = "Impossible! Stay your attack, mortals... I submit! I submit!" - --L.power_next = "Next Power" -end - -L = BigWigs:NewBossLocale("Ragnaros", "esES") -if L then - --L.warmup_message = "RP started, engaging in ~73s" - - --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!" - --L.submerge_bar = "Submerge" - - --L.emerge = "Emerge" - --L.emerge_desc = "Warn for Ragnaros' emerge." - --L.emerge_message = "Ragnaros emerged, 3 mins until submerge!" - --L.emerge_bar = "Emerge" -end diff --git a/MoltenCore_Classic/Locales/esMX.lua b/MoltenCore_Classic/Locales/esMX.lua deleted file mode 100644 index 7562805..0000000 --- a/MoltenCore_Classic/Locales/esMX.lua +++ /dev/null @@ -1,32 +0,0 @@ -local L = BigWigs:NewBossLocale("Lucifron", "esMX") -if not L then return end -if L then - --L.mc_bar = "MC: %s" -end - -L = BigWigs:NewBossLocale("Majordomo Executus", "esMX") -if L then - --L.disabletrigger = "Impossible! Stay your attack, mortals... I submit! I submit!" - --L.power_next = "Next Power" -end - -L = BigWigs:NewBossLocale("Ragnaros", "esMX") -if L then - --L.warmup_message = "RP started, engaging in ~73s" - - --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!" - --L.submerge_bar = "Submerge" - - --L.emerge = "Emerge" - --L.emerge_desc = "Warn for Ragnaros' emerge." - --L.emerge_message = "Ragnaros emerged, 3 mins until submerge!" - --L.emerge_bar = "Emerge" -end diff --git a/MoltenCore_Classic/Locales/frFR.lua b/MoltenCore_Classic/Locales/frFR.lua deleted file mode 100644 index 27e20c9..0000000 --- a/MoltenCore_Classic/Locales/frFR.lua +++ /dev/null @@ -1,32 +0,0 @@ -local L = BigWigs:NewBossLocale("Lucifron", "frFR") -if not L then return end -if L then - L.mc_bar = "CM : %s" -end - -L = BigWigs:NewBossLocale("Majordomo Executus", "frFR") -if L then - L.disabletrigger = "Impossible ! Arrêtez votre attaque, mortels... Je me rends ! Je me rends !" - --L.power_next = "Next Power" -end - -L = BigWigs:NewBossLocale("Ragnaros", "frFR") -if L then - --L.warmup_message = "RP started, engaging in ~73s" - - L.engage_trigger = "ET MAINTENANT" - L.submerge_trigger = "VENEZ, MES SERVITEURS" - - 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 !" - L.submerge_bar = "Départ de Ragnaros" - - L.emerge = "Émergence" - L.emerge_desc = "Préviens quand Ragnaros émerge." - L.emerge_message = "Ragnaros en surface, 3 min. avant immersion !" - L.emerge_bar = "Retour de Ragnaros" -end diff --git a/MoltenCore_Classic/Locales/itIT.lua b/MoltenCore_Classic/Locales/itIT.lua deleted file mode 100644 index b6ba5a8..0000000 --- a/MoltenCore_Classic/Locales/itIT.lua +++ /dev/null @@ -1,32 +0,0 @@ -local L = BigWigs:NewBossLocale("Lucifron", "itIT") -if not L then return end -if L then - --L.mc_bar = "MC: %s" -end - -L = BigWigs:NewBossLocale("Majordomo Executus", "itIT") -if L then - --L.disabletrigger = "Impossible! Stay your attack, mortals... I submit! I submit!" - --L.power_next = "Next Power" -end - -L = BigWigs:NewBossLocale("Ragnaros", "itIT") -if L then - --L.warmup_message = "RP started, engaging in ~73s" - - --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!" - --L.submerge_bar = "Submerge" - - --L.emerge = "Emerge" - --L.emerge_desc = "Warn for Ragnaros' emerge." - --L.emerge_message = "Ragnaros emerged, 3 mins until submerge!" - --L.emerge_bar = "Emerge" -end diff --git a/MoltenCore_Classic/Locales/koKR.lua b/MoltenCore_Classic/Locales/koKR.lua deleted file mode 100644 index a59ed95..0000000 --- a/MoltenCore_Classic/Locales/koKR.lua +++ /dev/null @@ -1,32 +0,0 @@ -local L = BigWigs:NewBossLocale("Lucifron", "koKR") -if not L then return end -if L then - L.mc_bar = "정배: %s" -end - -L = BigWigs:NewBossLocale("Majordomo Executus", "koKR") -if L then - L.disabletrigger = "이럴 수가! 그만! 제발 그만! 내가 졌다! 내가 졌어!" - --L.power_next = "Next Power" -end - -L = BigWigs:NewBossLocale("Ragnaros", "koKR") -if L then - --L.warmup_message = "RP started, engaging in ~73s" - - L.engage_trigger = "이제 너희" - L.submerge_trigger = "나의 종들아" - - L.knockback_message = "광역 튕겨냄!" - L.knockback_bar = "광역 튕겨냄" - - L.submerge = "사라짐 경고" - L.submerge_desc = "라그나로스 사라짐 & 피조물에 대한 경고" - L.submerge_message = "90초간 라그나로스 사라짐. 피조물 등장!" - L.submerge_bar = "피조물 등장" - - L.emerge = "등장 경고" - L.emerge_desc = "라그나로스 등장에 대한 경고" - L.emerge_message = "라그나로스가 등장했습니다. 3분후 피조물 소환!" - L.emerge_bar = "라그나로스 등장" -end diff --git a/MoltenCore_Classic/Locales/locales.xml b/MoltenCore_Classic/Locales/locales.xml deleted file mode 100644 index 3283f78..0000000 --- a/MoltenCore_Classic/Locales/locales.xml +++ /dev/null @@ -1,15 +0,0 @@ - - -