From a24173aa636db7cdff63889921c2b2fbab8c0849 Mon Sep 17 00:00:00 2001 From: funkydude Date: Fri, 19 Jul 2024 15:18:37 +0100 Subject: [PATCH] Updates and cleanups for classic --- StormCliffs_Classic/Azuregos.lua | 46 ++++++++++++++-------- StormCliffs_Classic/Locales/deDE.lua | 39 ------------------- StormCliffs_Classic/Locales/esES.lua | 39 ------------------- StormCliffs_Classic/Locales/esMX.lua | 39 ------------------- StormCliffs_Classic/Locales/frFR.lua | 39 ------------------- StormCliffs_Classic/Locales/itIT.lua | 39 ------------------- StormCliffs_Classic/Locales/koKR.lua | 39 ------------------- StormCliffs_Classic/Locales/ptBR.lua | 39 ------------------- StormCliffs_Classic/Locales/ruRU.lua | 39 ------------------- StormCliffs_Classic/Locales/zhCN.lua | 39 ------------------- StormCliffs_Classic/Locales/zhTW.lua | 39 ------------------- TheTaintedScar_Classic/Kazzak.lua | 39 +++++++++++++------ TheTaintedScar_Classic/Locales/deDE.lua | 4 -- TheTaintedScar_Classic/Locales/esES.lua | 4 -- TheTaintedScar_Classic/Locales/esMX.lua | 4 -- TheTaintedScar_Classic/Locales/frFR.lua | 4 -- TheTaintedScar_Classic/Locales/itIT.lua | 4 -- TheTaintedScar_Classic/Locales/koKR.lua | 4 -- TheTaintedScar_Classic/Locales/ptBR.lua | 4 -- TheTaintedScar_Classic/Locales/ruRU.lua | 4 -- TheTaintedScar_Classic/Locales/zhCN.lua | 4 -- TheTaintedScar_Classic/Locales/zhTW.lua | 4 -- World_Classic/Azuregos.lua | 51 ++++++++++++++----------- World_Classic/Kazzak.lua | 15 ++++---- World_Classic/Locales/deDE.lua | 4 -- World_Classic/Locales/esES.lua | 4 -- World_Classic/Locales/esMX.lua | 4 -- World_Classic/Locales/frFR.lua | 4 -- World_Classic/Locales/itIT.lua | 14 +++---- World_Classic/Locales/koKR.lua | 4 -- World_Classic/Locales/ptBR.lua | 4 -- World_Classic/Locales/ruRU.lua | 4 -- World_Classic/Locales/zhCN.lua | 4 -- World_Classic/Locales/zhTW.lua | 4 -- 34 files changed, 98 insertions(+), 533 deletions(-) diff --git a/StormCliffs_Classic/Azuregos.lua b/StormCliffs_Classic/Azuregos.lua index 26d2da4..ea80ac5 100644 --- a/StormCliffs_Classic/Azuregos.lua +++ b/StormCliffs_Classic/Azuregos.lua @@ -15,8 +15,6 @@ mod:SetAllowWin(true) local L = mod:GetLocale() if L then L.bossName = "Azuregos" - - L.teleport_trigger = "Come, little ones" end -------------------------------------------------------------------------------- @@ -25,11 +23,14 @@ end function mod:GetOptions() return { - 22067, -- Reflection + {22067, "CASTBAR", "EMPHASIZE"}, -- Reflection 21147, -- Arcane Vacuum - "stages", + 21099, -- Frost Breath + 21097, -- Manastorm },nil,{ [21147] = CL.teleport, -- Arcane Vacuum (Teleport) + [21099] = CL.interruptible, -- Frost Breath (Interruptible) + [21097] = CL.interruptible, -- Manastorm (Interruptible) } end @@ -38,33 +39,46 @@ function mod:OnRegister() end function mod:OnBossEnable() - self:Log("SPELL_AURA_APPLIED", "Reflection", 22067) + self:Log("SPELL_AURA_APPLIED", "ReflectionApplied", 22067) self:Log("SPELL_AURA_REMOVED", "ReflectionRemoved", 22067) - - self:RegisterEvent("CHAT_MSG_MONSTER_YELL") + self:Log("SPELL_CAST_SUCCESS", "ArcaneVacuum", 21147) + self:Log("SPELL_CAST_START", "FrostBreath", 21099) + self:Log("SPELL_CAST_START", "Manastorm", 21097) end function mod:OnEngage() - self:Message("stages", "cyan", CL.stage:format(1), false) + self:CDBar(22067, 14.6) -- Reflection end -------------------------------------------------------------------------------- -- Event Handlers -- -function mod:Reflection(args) - self:Message(args.spellId, "yellow", CL.duration:format(args.spellName, 10)) - self:Bar(args.spellId, 10) +function mod:ReflectionApplied(args) + self:StopBar(args.spellName) + self:Message(args.spellId, "red") + self:CastBar(args.spellId, 10) self:PlaySound(args.spellId, "warning") end function mod:ReflectionRemoved(args) - self:Message(args.spellId, "green", CL.over:format(args.spellName)) + self:StopBar(CL.cast:format(args.spellName)) + self:Message(args.spellId, "green", CL.over:format(args.spellName), nil, true) -- Disable emphasize + self:CDBar(args.spellId, 10) self:PlaySound(args.spellId, "info") end -function mod:CHAT_MSG_MONSTER_YELL(_, msg) - if msg:find(L.teleport_trigger, nil, true) then - self:Message(21147, "red", CL.teleport) - end +function mod:ArcaneVacuum(args) + self:Message(args.spellId, "yellow", CL.teleport) + self:PlaySound(args.spellId, "alarm") +end + +function mod:FrostBreath(args) + self:Message(args.spellId, "orange", CL.extra:format(args.spellName, CL.interruptible)) + self:PlaySound(args.spellId, "alert") +end + +function mod:Manastorm(args) + self:Message(args.spellId, "orange", CL.extra:format(args.spellName, CL.interruptible)) + self:PlaySound(args.spellId, "alert") end diff --git a/StormCliffs_Classic/Locales/deDE.lua b/StormCliffs_Classic/Locales/deDE.lua index 187ae39..8f46c3a 100644 --- a/StormCliffs_Classic/Locales/deDE.lua +++ b/StormCliffs_Classic/Locales/deDE.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "deDE") if not L then return end if L then L.bossName = "Azuregos" - - L.teleport_trigger = "Tretet mir" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "deDE") -if L then - L.bossName = "Lord Kazzak" - - L.engage_trigger = "Für die Legion! Für Kil'jaeden!" - - L.supreme_mode = "Supreme Mode" -end - -L = BigWigs:NewBossLocale("Emeriss", "deDE") -if L then - L.bossName = "Emeriss" - - L.engage_trigger = "Die Hoffnung ist eine KRANKHEIT der Seele. Dieses Land wird verdorren und sterben!" -end - -L = BigWigs:NewBossLocale("Lethon", "deDE") -if L then - L.bossName = "Lethon" - - L.engage_trigger = "Ich fühle die SCHATTEN in Euren Herzen. Niemals darf das Böse Ruhe finden!" -end - -L = BigWigs:NewBossLocale("Taerar", "deDE") -if L then - L.bossName = "Taerar" - - L.engage_trigger = "Frieden ist nur ein flüchtiger Traum! Von nun an herrscht der ALPTRAUM!" -end - -L = BigWigs:NewBossLocale("Ysondre", "deDE") -if L then - L.bossName = "Ysondre" - - L.engage_trigger = "Die Fäden des LEBENS wurden durchtrennt! Die Träumer müssen gerächt werden!" end diff --git a/StormCliffs_Classic/Locales/esES.lua b/StormCliffs_Classic/Locales/esES.lua index 4fae998..5e8cba9 100644 --- a/StormCliffs_Classic/Locales/esES.lua +++ b/StormCliffs_Classic/Locales/esES.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "esES") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "esES") -if L then - L.bossName = "Lord Kazzak" - - L.engage_trigger = "¡Por la Legión! ¡Por Kil'Jaeden!" - - L.supreme_mode = "Modo supremo" --is this a spell name? -end - -L = BigWigs:NewBossLocale("Emeriss", "esES") -if L then - L.bossName = "Emeriss" - - L.engage_trigger = "¡La esperanza es una ENFERMEDAD del alma! ¡Esta tierra se marchitará y morirá!" -end - -L = BigWigs:NewBossLocale("Lethon", "esES") -if L then - L.bossName = "Lethon" - - L.engage_trigger = "Puedo sentir la SOMBRA en vuestros corazones. ¡No puede haber descanso para los malos!" -end - -L = BigWigs:NewBossLocale("Taerar", "esES") -if L then - L.bossName = "Taerar" - - L.engage_trigger = "¡La paz no es más que un sueño fugaz! ¡Que reine la PESADILLA!" -end - -L = BigWigs:NewBossLocale("Ysondre", "esES") -if L then - L.bossName = "Ysondre" - - L.engage_trigger = "¡Los hilos de la VIDA se han roto! ¡Tenemos que vengar a los Soñadores!" end diff --git a/StormCliffs_Classic/Locales/esMX.lua b/StormCliffs_Classic/Locales/esMX.lua index 2460525..812123b 100644 --- a/StormCliffs_Classic/Locales/esMX.lua +++ b/StormCliffs_Classic/Locales/esMX.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "esMX") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "esMX") -if L then - L.bossName = "Lord Kazzak" - - L.engage_trigger = "¡Por la Legión! ¡Por Kil'Jaeden!" - - L.supreme_mode = "Modo Supremo" --is this a spell name? -end - -L = BigWigs:NewBossLocale("Emeriss", "esMX") -if L then - L.bossName = "Emeriss" - - L.engage_trigger = "¡La esperanza es una ENFERMEDAD del alma! ¡Esta tierra se marchitará y morirá!" -end - -L = BigWigs:NewBossLocale("Lethon", "esMX") -if L then - L.bossName = "Lethon" - - L.engage_trigger = "Puedo sentir la SOMBRA en sus corazones. ¡No puede haber descanso para los malos!" -end - -L = BigWigs:NewBossLocale("Taerar", "esMX") -if L then - L.bossName = "Taerar" - - L.engage_trigger = "¡La paz no es más que un sueño fugaz! ¡Que reine la PESADILLA!" -end - -L = BigWigs:NewBossLocale("Ysondre", "esMX") -if L then - L.bossName = "Ysondre" - - L.engage_trigger = "¡Los hilos de la VIDA se han roto! ¡Tenemos que vengar a los Soñadores!" end diff --git a/StormCliffs_Classic/Locales/frFR.lua b/StormCliffs_Classic/Locales/frFR.lua index 9e6d4e5..614b265 100644 --- a/StormCliffs_Classic/Locales/frFR.lua +++ b/StormCliffs_Classic/Locales/frFR.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "frFR") if not L then return end if L then L.bossName = "Azuregos" - - L.teleport_trigger = "Venez m'affronter, mes petits\194\160" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "frFR") -if L then - L.bossName = "Seigneur Kazzak" - - L.engage_trigger = "Pour la Légion ! Pour Kil'Jaeden !" - - L.supreme_mode = "Mode suprême" -end - -L = BigWigs:NewBossLocale("Emeriss", "frFR") -if L then - L.bossName = "Emeriss" - - L.engage_trigger = "L'espoir est une MALADIE de l'âme ! Ces terres vont flétrir et mourir !" -end - -L = BigWigs:NewBossLocale("Lethon", "frFR") -if L then - L.bossName = "Léthon" - - L.engage_trigger = "Je sens l'OMBRE dans vos cœurs. Il ne peut y avoir de repos pour les vilains !" -end - -L = BigWigs:NewBossLocale("Taerar", "frFR") -if L then - L.bossName = "Taerar" - - L.engage_trigger = "La paix n'est qu'un rêve éphémère ! Que le CAUCHEMAR règne !" -end - -L = BigWigs:NewBossLocale("Ysondre", "frFR") -if L then - L.bossName = "Ysondre" - - L.engage_trigger = "Les fils de la VIE ont été coupés ! Les Rêveurs doivent être vengés !" end diff --git a/StormCliffs_Classic/Locales/itIT.lua b/StormCliffs_Classic/Locales/itIT.lua index 0c08f3f..2a75570 100644 --- a/StormCliffs_Classic/Locales/itIT.lua +++ b/StormCliffs_Classic/Locales/itIT.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "itIT") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "itIT") -if L then - L.bossName = "Sire Kazzak" - - -- L.engage_trigger = "For the Legion! For Kil'Jaeden!" - - -- L.supreme_mode = "Supreme Mode" -end - -L = BigWigs:NewBossLocale("Emeriss", "itIT") -if L then - L.bossName = "Emeriss" - - -- L.engage_trigger = "Hope is a DISEASE of the soul! This land shall wither and die!" -end - -L = BigWigs:NewBossLocale("Lethon", "itIT") -if L then - L.bossName = "Lethon" - - -- L.engage_trigger = "I can sense the SHADOW on your hearts. There can be no rest for the wicked!" -end - -L = BigWigs:NewBossLocale("Taerar", "itIT") -if L then - L.bossName = "Taerar" - - -- L.engage_trigger = "Peace is but a fleeting dream! Let the NIGHTMARE reign!" -end - -L = BigWigs:NewBossLocale("Ysondre", "itIT") -if L then - L.bossName = "Ysondre" - - -- L.engage_trigger = "The strands of LIFE have been severed! The Dreamers must be avenged!" end diff --git a/StormCliffs_Classic/Locales/koKR.lua b/StormCliffs_Classic/Locales/koKR.lua index 974bf91..258bb74 100644 --- a/StormCliffs_Classic/Locales/koKR.lua +++ b/StormCliffs_Classic/Locales/koKR.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "koKR") if not L then return end if L then L.bossName = "아주어고스" - - L.teleport_trigger = "오너라, 조무래기들아! 덤벼봐라!" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "koKR") -if L then - L.bossName = "군주 카자크" - - L.engage_trigger = "불타는 군단과 킬제덴을 위하여!" - - L.supreme_mode = "무적 모드" -end - -L = BigWigs:NewBossLocale("Emeriss", "koKR") -if L then - L.bossName = "에메리스" - - L.engage_trigger = "희망은 영혼의 병! 이 땅은 말라 죽을 것이다!" -end - -L = BigWigs:NewBossLocale("Lethon", "koKR") -if L then - L.bossName = "레손" - - L.engage_trigger = "네놈들의 마음속에서 어둠이 느껴지는구나. 사악한 존재가 쉴 곳은 없다!" -end - -L = BigWigs:NewBossLocale("Taerar", "koKR") -if L then - L.bossName = "타에라" - - L.engage_trigger = "평화란 부질없는 꿈일 뿐! 이 세상은 악몽이 지배할 것이다!" -end - -L = BigWigs:NewBossLocale("Ysondre", "koKR") -if L then - L.bossName = "이손드레" - - L.engage_trigger = "생명의 끈이 끊어졌다! 꿈꾸는 자들이 복수하는 것이 틀림없다!" end diff --git a/StormCliffs_Classic/Locales/ptBR.lua b/StormCliffs_Classic/Locales/ptBR.lua index acd644c..232407b 100644 --- a/StormCliffs_Classic/Locales/ptBR.lua +++ b/StormCliffs_Classic/Locales/ptBR.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "ptBR") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "ptBR") -if L then - L.bossName = "Lorde Kazzak" - - L.engage_trigger = "Pela Legião! Por Kil'Jaeden!" - - L.supreme_mode = "Modo Supremo" -end - -L = BigWigs:NewBossLocale("Emeriss", "ptBR") -if L then - L.bossName = "Emeriss" - - L.engage_trigger = "A esperança é uma DOENÇA da alma! Estas terras definharão até a morte!" -end - -L = BigWigs:NewBossLocale("Lethon", "ptBR") -if L then - L.bossName = "Lethon" - - L.engage_trigger = "Eu sinto as TREVAS no coração de vocês. Não há descanso para os perversos!" -end - -L = BigWigs:NewBossLocale("Taerar", "ptBR") -if L then - L.bossName = "Taerar" - - L.engage_trigger = "A paz é um sonho efêmero! Que os PESADELOS reinem soberanos!" -end - -L = BigWigs:NewBossLocale("Ysondre", "ptBR") -if L then - L.bossName = "Ysondra" - - L.engage_trigger = "Os fios da VIDA foram cortados! Os Sonhadores serão vingados!" end diff --git a/StormCliffs_Classic/Locales/ruRU.lua b/StormCliffs_Classic/Locales/ruRU.lua index 83d2f1f..2017fff 100644 --- a/StormCliffs_Classic/Locales/ruRU.lua +++ b/StormCliffs_Classic/Locales/ruRU.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "ruRU") if not L then return end if L then L.bossName = "Азурегос" - - --L.teleport_trigger = "Come, little ones" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "ruRU") -if L then - L.bossName = "Владыка Каззак" - - L.engage_trigger = "За Легион! За Кил'джедена!" - - L.supreme_mode = "Высший режим" -end - -L = BigWigs:NewBossLocale("Emeriss", "ruRU") -if L then - L.bossName = "Эмерисс" - - L.engage_trigger = "Надежда – это БОЛЕЗНЬ души! Эта земля зачахнет и умрет!" -end - -L = BigWigs:NewBossLocale("Lethon", "ruRU") -if L then - L.bossName = "Летон" - - L.engage_trigger = "Я чувствую ТЕНЬ, нависшую над вашими сердцами. Нечестивцам не будет покоя!" -end - -L = BigWigs:NewBossLocale("Taerar", "ruRU") -if L then - L.bossName = "Таэрар" - - L.engage_trigger = "Мир – это всего лишь мимолетный сон. Пусть правит КОШМАР!" -end - -L = BigWigs:NewBossLocale("Ysondre", "ruRU") -if L then - L.bossName = "Исондра" - - L.engage_trigger = "Нити ЖИЗНИ разорваны! Отомстим за Спящих!" end diff --git a/StormCliffs_Classic/Locales/zhCN.lua b/StormCliffs_Classic/Locales/zhCN.lua index 758020b..33d8aa2 100644 --- a/StormCliffs_Classic/Locales/zhCN.lua +++ b/StormCliffs_Classic/Locales/zhCN.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "zhCN") if not L then return end if L then L.bossName = "艾索雷苟斯" - - L.teleport_trigger = "来吧，小子。面对我！" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "zhCN") -if L then - L.bossName = "卡扎克" - - L.engage_trigger = "为了军团！为了基尔加丹！" - - L.supreme_mode = "无敌模式" -end - -L = BigWigs:NewBossLocale("Emeriss", "zhCN") -if L then - L.bossName = "艾莫莉丝" - - L.engage_trigger = "希望是灵魂染上的疾病！这片土地应该枯竭，从此死气腾腾！" -end - -L = BigWigs:NewBossLocale("Lethon", "zhCN") -if L then - L.bossName = "莱索恩" - - L.engage_trigger = "我能感受到你内心的阴影。邪恶的侵蚀永远不会停止！" -end - -L = BigWigs:NewBossLocale("Taerar", "zhCN") -if L then - L.bossName = "泰拉尔" - - L.engage_trigger = "和平不过是短暂的梦想！让梦魇统治整个世界吧！" -end - -L = BigWigs:NewBossLocale("Ysondre", "zhCN") -if L then - L.bossName = "伊森德雷" - - L.engage_trigger = "生命的希冀已被切断！梦游者要展开报复！" end diff --git a/StormCliffs_Classic/Locales/zhTW.lua b/StormCliffs_Classic/Locales/zhTW.lua index e2663a0..385aef3 100644 --- a/StormCliffs_Classic/Locales/zhTW.lua +++ b/StormCliffs_Classic/Locales/zhTW.lua @@ -2,43 +2,4 @@ local L = BigWigs:NewBossLocale("Azuregos", "zhTW") if not L then return end if L then L.bossName = "艾索雷葛斯" - - L.teleport_trigger = "來吧，小子。面對我！" -end - -L = BigWigs:NewBossLocale("Lord Kazzak", "zhTW") -if L then - L.bossName = "卡札克" - - L.engage_trigger = "為了軍團！為了基爾加德！" - - L.supreme_mode = "上帝模式" -end - -L = BigWigs:NewBossLocale("Emeriss", "zhTW") -if L then - L.bossName = "艾莫莉絲" - - L.engage_trigger = "希望是靈魂染上的疾病！這片土地應該枯竭，從此死氣騰騰！" -end - -L = BigWigs:NewBossLocale("Lethon", "zhTW") -if L then - L.bossName = "雷索" - - L.engage_trigger = "我能感受到你內心的陰影。邪惡的侵蝕永遠不會停止！" -end - -L = BigWigs:NewBossLocale("Taerar", "zhTW") -if L then - L.bossName = "泰拉爾" - - L.engage_trigger = "和平不過是短暫的夢想！讓夢魘統治整個世界吧！" -end - -L = BigWigs:NewBossLocale("Ysondre", "zhTW") -if L then - L.bossName = "伊索德雷" - - L.engage_trigger = "生命的希冀已被切斷！夢遊者要展開報復！" end diff --git a/TheTaintedScar_Classic/Kazzak.lua b/TheTaintedScar_Classic/Kazzak.lua index e1c8efc..d591673 100644 --- a/TheTaintedScar_Classic/Kazzak.lua +++ b/TheTaintedScar_Classic/Kazzak.lua @@ -4,7 +4,7 @@ local mod, CL = BigWigs:NewBoss("Lord Kazzak Season of Discovery", 2789) if not mod then return end -mod:RegisterEnableMob(12397) +mod:RegisterEnableMob(230302) mod:SetEncounterID(3026) mod:SetAllowWin(true) @@ -15,10 +15,6 @@ mod:SetAllowWin(true) local L = mod:GetLocale() if L then L.bossName = "Lord Kazzak" - - L.engage_trigger = "For the Legion! For Kil'Jaeden!" - - L.supreme_mode = "Supreme Mode" end -------------------------------------------------------------------------------- @@ -30,7 +26,6 @@ function mod:GetOptions() 21056, -- Mark of Kazzak 21063, -- Twisted Reflection "berserk", - "stages", },nil,{ [21056] = CL.curse, -- Mark of Kazzak (Curse) } @@ -41,21 +36,24 @@ function mod:OnRegister() end function mod:OnBossEnable() - self:Log("SPELL_AURA_APPLIED", "MarkOfKazzak", 21056) - self:Log("SPELL_AURA_APPLIED", "TwistedReflection", 21063) + self:Log("SPELL_AURA_APPLIED", "MarkOfKazzakApplied", 21056) + self:Log("SPELL_AURA_APPLIED", "MarkOfKazzakRemoved", 21056) + self:Log("SPELL_AURA_APPLIED", "TwistedReflectionApplied", 21063) + self:Log("SPELL_AURA_APPLIED", "TwistedReflectionRemoved", 21063) + self:Log("SPELL_DISPEL", "Dispels", "*") end function mod:OnEngage() - self:Berserk(180, nil, nil, L.supreme_mode, L.supreme_mode) - self:Message("stages", "cyan", CL.stage:format(1), false) + self:Berserk(180) -- Actual spell is Frenzy (21340) end -------------------------------------------------------------------------------- -- Event Handlers -- -function mod:MarkOfKazzak(args) +function mod:MarkOfKazzakApplied(args) self:TargetMessage(args.spellId, "yellow", args.destName, CL.curse) + self:TargetBar(args.spellId, 60, args.destName, CL.curse) if self:Me(args.destGUID) then self:PlaySound(args.spellId, "warning", nil, args.destName) elseif self:Dispeller("curse") then @@ -63,9 +61,26 @@ function mod:MarkOfKazzak(args) end end -function mod:TwistedReflection(args) +function mod:MarkOfKazzakRemoved(args) + self:StopBar(CL.curse, args.destName) +end + +function mod:TwistedReflectionApplied(args) self:TargetMessage(args.spellId, "orange", args.destName) + self:TargetBar(args.spellId, 45, args.destName) if self:Dispeller("magic") then self:PlaySound(args.spellId, "alarm") end end + +function mod:TwistedReflectionRemoved(args) + self:StopBar(args.spellName, args.destName) +end + +function mod:Dispels(args) + if args.extraSpellName == self:SpellName(21056) then + self:Message(21056, "green", CL.removed_by:format(CL.curse, self:ColorName(args.sourceName))) + elseif args.extraSpellName == self:SpellName(21063) then + self:Message(21063, "green", CL.removed_by:format(args.extraSpellName, self:ColorName(args.sourceName))) + end +end diff --git a/TheTaintedScar_Classic/Locales/deDE.lua b/TheTaintedScar_Classic/Locales/deDE.lua index 22fc371..21e060a 100644 --- a/TheTaintedScar_Classic/Locales/deDE.lua +++ b/TheTaintedScar_Classic/Locales/deDE.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "deDE") if L then L.bossName = "Lord Kazzak" - - L.engage_trigger = "Für die Legion! Für Kil'jaeden!" - - L.supreme_mode = "Supreme Mode" end diff --git a/TheTaintedScar_Classic/Locales/esES.lua b/TheTaintedScar_Classic/Locales/esES.lua index e565cd8..5eee452 100644 --- a/TheTaintedScar_Classic/Locales/esES.lua +++ b/TheTaintedScar_Classic/Locales/esES.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "esES") if L then L.bossName = "Lord Kazzak" - - L.engage_trigger = "¡Por la Legión! ¡Por Kil'Jaeden!" - - L.supreme_mode = "Modo supremo" --is this a spell name? end diff --git a/TheTaintedScar_Classic/Locales/esMX.lua b/TheTaintedScar_Classic/Locales/esMX.lua index 392f169..60a69e0 100644 --- a/TheTaintedScar_Classic/Locales/esMX.lua +++ b/TheTaintedScar_Classic/Locales/esMX.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "esMX") if L then L.bossName = "Lord Kazzak" - - L.engage_trigger = "¡Por la Legión! ¡Por Kil'Jaeden!" - - L.supreme_mode = "Modo Supremo" --is this a spell name? end diff --git a/TheTaintedScar_Classic/Locales/frFR.lua b/TheTaintedScar_Classic/Locales/frFR.lua index d690b7a..c545ea4 100644 --- a/TheTaintedScar_Classic/Locales/frFR.lua +++ b/TheTaintedScar_Classic/Locales/frFR.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "frFR") if L then L.bossName = "Seigneur Kazzak" - - L.engage_trigger = "Pour la Légion ! Pour Kil'Jaeden !" - - L.supreme_mode = "Mode suprême" end diff --git a/TheTaintedScar_Classic/Locales/itIT.lua b/TheTaintedScar_Classic/Locales/itIT.lua index 41e6f46..68fcadb 100644 --- a/TheTaintedScar_Classic/Locales/itIT.lua +++ b/TheTaintedScar_Classic/Locales/itIT.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "itIT") if L then L.bossName = "Sire Kazzak" - - -- L.engage_trigger = "For the Legion! For Kil'Jaeden!" - - -- L.supreme_mode = "Supreme Mode" end diff --git a/TheTaintedScar_Classic/Locales/koKR.lua b/TheTaintedScar_Classic/Locales/koKR.lua index a253b3d..5f2a245 100644 --- a/TheTaintedScar_Classic/Locales/koKR.lua +++ b/TheTaintedScar_Classic/Locales/koKR.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "koKR") if L then L.bossName = "군주 카자크" - - L.engage_trigger = "불타는 군단과 킬제덴을 위하여!" - - L.supreme_mode = "무적 모드" end diff --git a/TheTaintedScar_Classic/Locales/ptBR.lua b/TheTaintedScar_Classic/Locales/ptBR.lua index 7459aa5..1d828b0 100644 --- a/TheTaintedScar_Classic/Locales/ptBR.lua +++ b/TheTaintedScar_Classic/Locales/ptBR.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "ptBR") if L then L.bossName = "Lorde Kazzak" - - L.engage_trigger = "Pela Legião! Por Kil'Jaeden!" - - L.supreme_mode = "Modo Supremo" end diff --git a/TheTaintedScar_Classic/Locales/ruRU.lua b/TheTaintedScar_Classic/Locales/ruRU.lua index 3a6faf9..d30ce23 100644 --- a/TheTaintedScar_Classic/Locales/ruRU.lua +++ b/TheTaintedScar_Classic/Locales/ruRU.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "ruRU") if L then L.bossName = "Владыка Каззак" - - L.engage_trigger = "За Легион! За Кил'джедена!" - - L.supreme_mode = "Высший режим" end diff --git a/TheTaintedScar_Classic/Locales/zhCN.lua b/TheTaintedScar_Classic/Locales/zhCN.lua index 84a05f3..448a7de 100644 --- a/TheTaintedScar_Classic/Locales/zhCN.lua +++ b/TheTaintedScar_Classic/Locales/zhCN.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "zhCN") if L then L.bossName = "卡扎克" - - L.engage_trigger = "为了军团！为了基尔加丹！" - - L.supreme_mode = "无敌模式" end diff --git a/TheTaintedScar_Classic/Locales/zhTW.lua b/TheTaintedScar_Classic/Locales/zhTW.lua index fa4321b..db7cf12 100644 --- a/TheTaintedScar_Classic/Locales/zhTW.lua +++ b/TheTaintedScar_Classic/Locales/zhTW.lua @@ -1,8 +1,4 @@ local L = BigWigs:NewBossLocale("Lord Kazzak Season of Discovery", "zhTW") if L then L.bossName = "卡札克" - - L.engage_trigger = "為了軍團！為了基爾加德！" - - L.supreme_mode = "上帝模式" end diff --git a/World_Classic/Azuregos.lua b/World_Classic/Azuregos.lua index 6fe23ee..d986b18 100644 --- a/World_Classic/Azuregos.lua +++ b/World_Classic/Azuregos.lua @@ -17,8 +17,6 @@ mod.worldBoss = 6109 local L = mod:GetLocale() if L then L.bossName = "Azuregos" - - L.teleport_trigger = "Come, little ones" end -------------------------------------------------------------------------------- @@ -27,10 +25,14 @@ end function mod:GetOptions() return { - 22067, -- Reflection + {22067, "CASTBAR", "EMPHASIZE"}, -- Reflection 21147, -- Arcane Vacuum + 21099, -- Frost Breath + 21097, -- Manastorm },nil,{ [21147] = CL.teleport, -- Arcane Vacuum (Teleport) + [21099] = CL.interruptible, -- Frost Breath (Interruptible) + [21097] = CL.interruptible, -- Manastorm (Interruptible) } end @@ -39,13 +41,11 @@ function mod:OnRegister() end function mod:OnBossEnable() - --self:ScheduleTimer("CheckForEngage", 1) - --self:RegisterEvent("BOSS_KILL") - - self:Log("SPELL_AURA_APPLIED", "Reflection", 22067) + self:Log("SPELL_AURA_APPLIED", "ReflectionApplied", 22067) self:Log("SPELL_AURA_REMOVED", "ReflectionRemoved", 22067) - - self:RegisterEvent("CHAT_MSG_MONSTER_YELL") + self:Log("SPELL_CAST_SUCCESS", "ArcaneVacuum", 21147) + self:Log("SPELL_CAST_START", "FrostBreath", 21099) + self:Log("SPELL_CAST_START", "Manastorm", 21097) self:Death("Win", 6109) end @@ -54,25 +54,30 @@ end -- Event Handlers -- ---function mod:BOSS_KILL(_, id) --- if id == 0000 then --- self:Win() --- end ---end - -function mod:Reflection(args) - self:Message(args.spellId, "yellow", CL.duration:format(args.spellName, 10)) - self:Bar(args.spellId, 10) +function mod:ReflectionApplied(args) + self:StopBar(args.spellName) + self:Message(args.spellId, "red") + self:CastBar(args.spellId, 10) self:PlaySound(args.spellId, "warning") end function mod:ReflectionRemoved(args) - self:Message(args.spellId, "green", CL.over:format(args.spellName)) + self:StopBar(CL.cast:format(args.spellName)) + self:Message(args.spellId, "green", CL.over:format(args.spellName), nil, true) -- Disable emphasize self:PlaySound(args.spellId, "info") end -function mod:CHAT_MSG_MONSTER_YELL(_, msg) - if msg:find(L.teleport_trigger, nil, true) then - self:Message(21147, "red", CL.teleport) - end +function mod:ArcaneVacuum(args) + self:Message(args.spellId, "yellow", CL.teleport) + self:PlaySound(args.spellId, "alarm") +end + +function mod:FrostBreath(args) + self:Message(args.spellId, "orange", CL.extra:format(args.spellName, CL.interruptible)) + self:PlaySound(args.spellId, "alert") +end + +function mod:Manastorm(args) + self:Message(args.spellId, "orange", CL.extra:format(args.spellName, CL.interruptible)) + self:PlaySound(args.spellId, "alert") end diff --git a/World_Classic/Kazzak.lua b/World_Classic/Kazzak.lua index 248675c..54f8586 100644 --- a/World_Classic/Kazzak.lua +++ b/World_Classic/Kazzak.lua @@ -19,8 +19,6 @@ if L then L.bossName = "Lord Kazzak" L.engage_trigger = "For the Legion! For Kil'Jaeden!" - - L.supreme_mode = "Supreme Mode" end -------------------------------------------------------------------------------- @@ -42,8 +40,8 @@ function mod:OnRegister() end function mod:OnBossEnable() - self:Log("SPELL_AURA_APPLIED", "MarkOfKazzak", 21056) - self:Log("SPELL_AURA_APPLIED", "TwistedReflection", 21063) + self:Log("SPELL_AURA_APPLIED", "MarkOfKazzakApplied", 21056) + self:Log("SPELL_AURA_APPLIED", "TwistedReflectionApplied", 21063) self:RegisterEvent("CHAT_MSG_MONSTER_YELL") self:RegisterEvent("PLAYER_REGEN_DISABLED", "CheckForEngage") @@ -53,13 +51,14 @@ end function mod:OnEngage() self:RegisterEvent("PLAYER_REGEN_ENABLED", "CheckForWipe") + self:Berserk(180) end -------------------------------------------------------------------------------- -- Event Handlers -- -function mod:MarkOfKazzak(args) +function mod:MarkOfKazzakApplied(args) self:TargetMessage(args.spellId, "yellow", args.destName, CL.curse) if self:Me(args.destGUID) then self:PlaySound(args.spellId, "warning", nil, args.destName) @@ -68,7 +67,7 @@ function mod:MarkOfKazzak(args) end end -function mod:TwistedReflection(args) +function mod:TwistedReflectionApplied(args) self:TargetMessage(args.spellId, "orange", args.destName) if self:Dispeller("magic") then self:PlaySound(args.spellId, "alarm") @@ -77,7 +76,9 @@ end function mod:CHAT_MSG_MONSTER_YELL(_, msg) if msg:find(L.engage_trigger, nil, true) then + if self:IsEngaged() then + self:Wipe() + end self:Engage() - self:Berserk(180, nil, nil, L.supreme_mode, L.supreme_mode) end end diff --git a/World_Classic/Locales/deDE.lua b/World_Classic/Locales/deDE.lua index 187ae39..78f5cec 100644 --- a/World_Classic/Locales/deDE.lua +++ b/World_Classic/Locales/deDE.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "deDE") if not L then return end if L then L.bossName = "Azuregos" - - L.teleport_trigger = "Tretet mir" end L = BigWigs:NewBossLocale("Lord Kazzak", "deDE") @@ -11,8 +9,6 @@ if L then L.bossName = "Lord Kazzak" L.engage_trigger = "Für die Legion! Für Kil'jaeden!" - - L.supreme_mode = "Supreme Mode" end L = BigWigs:NewBossLocale("Emeriss", "deDE") diff --git a/World_Classic/Locales/esES.lua b/World_Classic/Locales/esES.lua index 4fae998..0c13c2d 100644 --- a/World_Classic/Locales/esES.lua +++ b/World_Classic/Locales/esES.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "esES") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" end L = BigWigs:NewBossLocale("Lord Kazzak", "esES") @@ -11,8 +9,6 @@ if L then L.bossName = "Lord Kazzak" L.engage_trigger = "¡Por la Legión! ¡Por Kil'Jaeden!" - - L.supreme_mode = "Modo supremo" --is this a spell name? end L = BigWigs:NewBossLocale("Emeriss", "esES") diff --git a/World_Classic/Locales/esMX.lua b/World_Classic/Locales/esMX.lua index 2460525..edb4154 100644 --- a/World_Classic/Locales/esMX.lua +++ b/World_Classic/Locales/esMX.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "esMX") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" end L = BigWigs:NewBossLocale("Lord Kazzak", "esMX") @@ -11,8 +9,6 @@ if L then L.bossName = "Lord Kazzak" L.engage_trigger = "¡Por la Legión! ¡Por Kil'Jaeden!" - - L.supreme_mode = "Modo Supremo" --is this a spell name? end L = BigWigs:NewBossLocale("Emeriss", "esMX") diff --git a/World_Classic/Locales/frFR.lua b/World_Classic/Locales/frFR.lua index 9e6d4e5..4c4880c 100644 --- a/World_Classic/Locales/frFR.lua +++ b/World_Classic/Locales/frFR.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "frFR") if not L then return end if L then L.bossName = "Azuregos" - - L.teleport_trigger = "Venez m'affronter, mes petits\194\160" end L = BigWigs:NewBossLocale("Lord Kazzak", "frFR") @@ -11,8 +9,6 @@ if L then L.bossName = "Seigneur Kazzak" L.engage_trigger = "Pour la Légion ! Pour Kil'Jaeden !" - - L.supreme_mode = "Mode suprême" end L = BigWigs:NewBossLocale("Emeriss", "frFR") diff --git a/World_Classic/Locales/itIT.lua b/World_Classic/Locales/itIT.lua index 0c08f3f..4ef91f5 100644 --- a/World_Classic/Locales/itIT.lua +++ b/World_Classic/Locales/itIT.lua @@ -2,43 +2,39 @@ local L = BigWigs:NewBossLocale("Azuregos", "itIT") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" end L = BigWigs:NewBossLocale("Lord Kazzak", "itIT") if L then L.bossName = "Sire Kazzak" - -- L.engage_trigger = "For the Legion! For Kil'Jaeden!" - - -- L.supreme_mode = "Supreme Mode" + --L.engage_trigger = "For the Legion! For Kil'Jaeden!" end L = BigWigs:NewBossLocale("Emeriss", "itIT") if L then L.bossName = "Emeriss" - -- L.engage_trigger = "Hope is a DISEASE of the soul! This land shall wither and die!" + --L.engage_trigger = "Hope is a DISEASE of the soul! This land shall wither and die!" end L = BigWigs:NewBossLocale("Lethon", "itIT") if L then L.bossName = "Lethon" - -- L.engage_trigger = "I can sense the SHADOW on your hearts. There can be no rest for the wicked!" + --L.engage_trigger = "I can sense the SHADOW on your hearts. There can be no rest for the wicked!" end L = BigWigs:NewBossLocale("Taerar", "itIT") if L then L.bossName = "Taerar" - -- L.engage_trigger = "Peace is but a fleeting dream! Let the NIGHTMARE reign!" + --L.engage_trigger = "Peace is but a fleeting dream! Let the NIGHTMARE reign!" end L = BigWigs:NewBossLocale("Ysondre", "itIT") if L then L.bossName = "Ysondre" - -- L.engage_trigger = "The strands of LIFE have been severed! The Dreamers must be avenged!" + --L.engage_trigger = "The strands of LIFE have been severed! The Dreamers must be avenged!" end diff --git a/World_Classic/Locales/koKR.lua b/World_Classic/Locales/koKR.lua index 974bf91..ccce574 100644 --- a/World_Classic/Locales/koKR.lua +++ b/World_Classic/Locales/koKR.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "koKR") if not L then return end if L then L.bossName = "아주어고스" - - L.teleport_trigger = "오너라, 조무래기들아! 덤벼봐라!" end L = BigWigs:NewBossLocale("Lord Kazzak", "koKR") @@ -11,8 +9,6 @@ if L then L.bossName = "군주 카자크" L.engage_trigger = "불타는 군단과 킬제덴을 위하여!" - - L.supreme_mode = "무적 모드" end L = BigWigs:NewBossLocale("Emeriss", "koKR") diff --git a/World_Classic/Locales/ptBR.lua b/World_Classic/Locales/ptBR.lua index acd644c..8769656 100644 --- a/World_Classic/Locales/ptBR.lua +++ b/World_Classic/Locales/ptBR.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "ptBR") if not L then return end if L then L.bossName = "Azuregos" - - --L.teleport_trigger = "Come, little ones" end L = BigWigs:NewBossLocale("Lord Kazzak", "ptBR") @@ -11,8 +9,6 @@ if L then L.bossName = "Lorde Kazzak" L.engage_trigger = "Pela Legião! Por Kil'Jaeden!" - - L.supreme_mode = "Modo Supremo" end L = BigWigs:NewBossLocale("Emeriss", "ptBR") diff --git a/World_Classic/Locales/ruRU.lua b/World_Classic/Locales/ruRU.lua index 83d2f1f..670a08b 100644 --- a/World_Classic/Locales/ruRU.lua +++ b/World_Classic/Locales/ruRU.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "ruRU") if not L then return end if L then L.bossName = "Азурегос" - - --L.teleport_trigger = "Come, little ones" end L = BigWigs:NewBossLocale("Lord Kazzak", "ruRU") @@ -11,8 +9,6 @@ if L then L.bossName = "Владыка Каззак" L.engage_trigger = "За Легион! За Кил'джедена!" - - L.supreme_mode = "Высший режим" end L = BigWigs:NewBossLocale("Emeriss", "ruRU") diff --git a/World_Classic/Locales/zhCN.lua b/World_Classic/Locales/zhCN.lua index 758020b..a6b2719 100644 --- a/World_Classic/Locales/zhCN.lua +++ b/World_Classic/Locales/zhCN.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "zhCN") if not L then return end if L then L.bossName = "艾索雷苟斯" - - L.teleport_trigger = "来吧，小子。面对我！" end L = BigWigs:NewBossLocale("Lord Kazzak", "zhCN") @@ -11,8 +9,6 @@ if L then L.bossName = "卡扎克" L.engage_trigger = "为了军团！为了基尔加丹！" - - L.supreme_mode = "无敌模式" end L = BigWigs:NewBossLocale("Emeriss", "zhCN") diff --git a/World_Classic/Locales/zhTW.lua b/World_Classic/Locales/zhTW.lua index e2663a0..bbccdb2 100644 --- a/World_Classic/Locales/zhTW.lua +++ b/World_Classic/Locales/zhTW.lua @@ -2,8 +2,6 @@ local L = BigWigs:NewBossLocale("Azuregos", "zhTW") if not L then return end if L then L.bossName = "艾索雷葛斯" - - L.teleport_trigger = "來吧，小子。面對我！" end L = BigWigs:NewBossLocale("Lord Kazzak", "zhTW") @@ -11,8 +9,6 @@ if L then L.bossName = "卡札克" L.engage_trigger = "為了軍團！為了基爾加德！" - - L.supreme_mode = "上帝模式" end L = BigWigs:NewBossLocale("Emeriss", "zhTW")