From 6b24a56a0f652511d6bc0020d6fc9b9f0e999527 Mon Sep 17 00:00:00 2001 From: Nick Towle Date: Sun, 8 Oct 2023 15:51:24 -0400 Subject: [PATCH] BfA/WaycrestManor/Trash: Infest, Horrific Visage, Drain Essence, Shadow Cleave, message updates --- BfA/WaycrestManor/Locales/deDE.lua | 33 +- BfA/WaycrestManor/Locales/esES.lua | 33 +- BfA/WaycrestManor/Locales/frFR.lua | 33 +- BfA/WaycrestManor/Locales/itIT.lua | 33 +- BfA/WaycrestManor/Locales/koKR.lua | 33 +- BfA/WaycrestManor/Locales/ptBR.lua | 33 +- BfA/WaycrestManor/Locales/ruRU.lua | 33 +- BfA/WaycrestManor/Locales/zhCN.lua | 33 +- BfA/WaycrestManor/Locales/zhTW.lua | 33 +- BfA/WaycrestManor/Options/Colors.lua | 16 +- BfA/WaycrestManor/Options/Sounds.lua | 18 +- BfA/WaycrestManor/Trash.lua | 470 ++++++++++++++++----------- 12 files changed, 463 insertions(+), 338 deletions(-) diff --git a/BfA/WaycrestManor/Locales/deDE.lua b/BfA/WaycrestManor/Locales/deDE.lua index 49523bc81..2dcc7627f 100644 --- a/BfA/WaycrestManor/Locales/deDE.lua +++ b/BfA/WaycrestManor/Locales/deDE.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "deDE") if not L then return end if L then - L.steward = "Bankettbediensteter" - L.gorger = "Bleicher Schlinger" - L.marksman = "Wahnsinniger Schütze" - L.runeweaver = "Runenweberin des Herzbanns" - L.vinetwister = "Herzbannrankenwinderin" - L.survivalist = "Irrsinniger Überlebenskünstler" - L.bryndle = "Matrone Brünndel" - L.thornshaper = "Dornformerin des Zirkels" + L.heartsbane_runeweaver = "Runenweberin des Herzbanns" + L.bewitched_captain = "Bezirzter Hauptmann" + L.thistle_acolyte = "Distelakolythin" + L.blight_toad = "Seuchenkröte" + L.dreadwing_raven = "Unheilschwingenrabe" + L.heartsbane_vinetwister = "Herzbannrankenwinderin" + L.runic_disciple = "Runenjüngerin" + L.coven_thornshaper = "Dornformerin des Zirkels" L.thornguard = "Dornwächter" - L.toad = "Seuchenkröte" - L.raven = "Unheilschwingenrabe" - L.soulcharmer = "Seelenbetörerin des Herzbanns" - L.captain = "Bezirzter Hauptmann" - L.disciple = "Runenjüngerin" - L.sister = "Gezeichnete Schwester" - L.alma = "Matrone Alma" + L.matron_bryndle = "Matrone Brünndel" + L.devouring_maggot = "Verschlingende Made" + L.pallid_gorger = "Bleicher Schlinger" + L.banquet_steward = "Bankettbediensteter" + L.crazed_marksman = "Wahnsinniger Schütze" + L.maddened_survivalist = "Irrsinniger Überlebenskünstler" + L.faceless_maiden = "Gesichtslose Maid" + L.marked_sister = "Gezeichnete Schwester" + L.matron_alma = "Matrone Alma" + L.heartsbane_soulcharmer = "Seelenbetörerin des Herzbanns" end L = BigWigs:NewBossLocale("Gorak Tul", "deDE") diff --git a/BfA/WaycrestManor/Locales/esES.lua b/BfA/WaycrestManor/Locales/esES.lua index f29b9e57a..90ea09c95 100644 --- a/BfA/WaycrestManor/Locales/esES.lua +++ b/BfA/WaycrestManor/Locales/esES.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "esES") or BigWigs:NewBossLocale("Waycrest Manor Trash", "esMX") if not L then return end if L then - L.steward = "Camarero de banquete" - L.gorger = "Engullidor pálido" - L.marksman = "Tirador enloquecido" - L.runeweaver = "Tejerruna Aterracorazón" - L.vinetwister = "Rizavid Aterracorazón" - L.survivalist = "Superviviente enajenado" - L.bryndle = "Matriarca Bryndle" - L.thornshaper = "Urdespina del aquelarre" + L.heartsbane_runeweaver = "Tejerruna Aterracorazón" + L.bewitched_captain = "Capitán aojado" + L.thistle_acolyte = "Acólita de cardo" + L.blight_toad = "Sapo de añublo" + L.dreadwing_raven = "Cuervo Alatemible" + L.heartsbane_vinetwister = "Rizavid Aterracorazón" + L.runic_disciple = "Discípula rúnica" + L.coven_thornshaper = "Urdespina del aquelarre" L.thornguard = "Guardaspina" - L.toad = "Sapo de añublo" - L.raven = "Cuervo Alatemible" - L.soulcharmer = "Hechizaalmas Aterracorazón" - L.captain = "Capitán aojado" - L.disciple = "Discípula rúnica" - L.sister = "Hermana marcada" - L.alma = "Matriarca Alma" + L.matron_bryndle = "Matriarca Bryndle" + L.devouring_maggot = "Cresa devoradora" + L.pallid_gorger = "Engullidor pálido" + L.banquet_steward = "Camarero de banquete" + L.crazed_marksman = "Tirador enloquecido" + L.maddened_survivalist = "Superviviente enajenado" + L.faceless_maiden = "Doncella sin rostro" + L.marked_sister = "Hermana marcada" + L.matron_alma = "Matriarca Alma" + L.heartsbane_soulcharmer = "Hechizaalmas Aterracorazón" end L = BigWigs:NewBossLocale("Gorak Tul", "esES") or BigWigs:NewBossLocale("Gorak Tul", "esMX") diff --git a/BfA/WaycrestManor/Locales/frFR.lua b/BfA/WaycrestManor/Locales/frFR.lua index cc2bc2013..798ce8d21 100644 --- a/BfA/WaycrestManor/Locales/frFR.lua +++ b/BfA/WaycrestManor/Locales/frFR.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "frFR") if not L then return end if L then - L.steward = "Organisateur de banquet" - L.gorger = "Goinfre blafard" - L.marksman = "Tireur frénétique" - L.runeweaver = "Tisserune malecarde" - L.vinetwister = "Tourneronces malecarde" - L.survivalist = "Survivaliste affolé" - L.bryndle = "Matrone Bryndle" - L.thornshaper = "Formeronces du Sabbat" + L.heartsbane_runeweaver = "Tisserune malecarde" + L.bewitched_captain = "Capitaine ensorcelé" + L.thistle_acolyte = "Acolyte des chardons" + L.blight_toad = "Crapaud chancreux" + L.dreadwing_raven = "Corbeau aile-de-l'effroi" + L.heartsbane_vinetwister = "Tourneronces malecarde" + L.runic_disciple = "Disciple runique" + L.coven_thornshaper = "Formeronces du Sabbat" L.thornguard = "Roncegarde" - L.toad = "Crapaud chancreux" - L.raven = "Corbeau aile-de-l'effroi" - L.soulcharmer = "Charmeuse d'âme malecarde" - L.captain = "Capitaine ensorcelé" - L.disciple = "Disciple runique" - L.sister = "Soeur marquée" - L.alma = "Matrone Alma" + L.matron_bryndle = "Matrone Bryndle" + L.devouring_maggot = "Asticot dévorant" + L.pallid_gorger = "Goinfre blafard" + L.banquet_steward = "Organisateur de banquet" + L.crazed_marksman = "Tireur frénétique" + L.maddened_survivalist = "Survivaliste affolé" + L.faceless_maiden = "Damoiselle sans-visage" + L.marked_sister = "Soeur marquée" + L.matron_alma = "Matrone Alma" + L.heartsbane_soulcharmer = "Charmeuse d'âme malecarde" end L = BigWigs:NewBossLocale("Gorak Tul", "frFR") diff --git a/BfA/WaycrestManor/Locales/itIT.lua b/BfA/WaycrestManor/Locales/itIT.lua index 0a977b903..deb36f2ba 100644 --- a/BfA/WaycrestManor/Locales/itIT.lua +++ b/BfA/WaycrestManor/Locales/itIT.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "itIT") if not L then return end if L then - L.steward = "Attendente del Banchetto" - L.gorger = "Divoratore Pallido" - L.marksman = "Tiratore Frenetico" - L.runeweaver = "Tessirune Frangicuore" - L.vinetwister = "Torciradici Frangicuore" - L.survivalist = "Survivalista Impazzito" - L.bryndle = "Matrona Bryndle" - L.thornshaper = "Plasmaspine della Congrega" + L.heartsbane_runeweaver = "Tessirune Frangicuore" + L.bewitched_captain = "Capitano Stregato" + L.thistle_acolyte = "Accolita del Cardo" + L.blight_toad = "Rospo Ammorbato" + L.dreadwing_raven = "Corvo Alatorva" + L.heartsbane_vinetwister = "Torciradici Frangicuore" + L.runic_disciple = "Discepola Runica" + L.coven_thornshaper = "Plasmaspine della Congrega" L.thornguard = "Guardaspine" - L.toad = "Rospo Ammorbato" - L.raven = "Corvo Alatorva" - L.soulcharmer = "Ammalianime Frangicuore" - L.captain = "Capitano Stregato" - L.disciple = "Discepola Runica" - L.sister = "Sorella Marchiata" - L.alma = "Matrona Alma" + L.matron_bryndle = "Matrona Bryndle" + L.devouring_maggot = "Camola Divoratrice" + L.pallid_gorger = "Divoratore Pallido" + L.banquet_steward = "Attendente del Banchetto" + L.crazed_marksman = "Tiratore Frenetico" + L.maddened_survivalist = "Survivalista Impazzito" + L.faceless_maiden = "Ancella Senzavolto" + L.marked_sister = "Sorella Marchiata" + L.matron_alma = "Matrona Alma" + L.heartsbane_soulcharmer = "Ammalianime Frangicuore" end L = BigWigs:NewBossLocale("Gorak Tul", "itIT") diff --git a/BfA/WaycrestManor/Locales/koKR.lua b/BfA/WaycrestManor/Locales/koKR.lua index 7b7aa700d..244bd4f92 100644 --- a/BfA/WaycrestManor/Locales/koKR.lua +++ b/BfA/WaycrestManor/Locales/koKR.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "koKR") if not L then return end if L then - L.steward = "연회 집사" - L.gorger = "창백한 탐식자" - L.marksman = "광기 어린 명사수" - L.runeweaver = "심장파멸 룬마술사" - L.vinetwister = "심장파멸 덩굴왜곡사" - L.survivalist = "광기의 생존주의자" - L.bryndle = "대모 브린들" - L.thornshaper = "서약단 가시장이" + L.heartsbane_runeweaver = "심장파멸 룬마술사" + L.bewitched_captain = "혼이 빠져나간 대장" + L.thistle_acolyte = "엉겅퀴 수행사제" + L.blight_toad = "역병 두꺼비" + L.dreadwing_raven = "공포날개 까마귀" + L.heartsbane_vinetwister = "심장파멸 덩굴왜곡사" + L.runic_disciple = "룬 신도" + L.coven_thornshaper = "서약단 가시장이" L.thornguard = "가시방어병" - L.toad = "역병 두꺼비" - L.raven = "공포날개 까마귀" - L.soulcharmer = "심장파멸 영혼매혹사" - L.captain = "혼이 빠져나간 대장" - L.disciple = "룬 신도" - L.sister = "징표 찍힌 자매" - L.alma = "대모 알마" + L.matron_bryndle = "대모 브린들" + L.devouring_maggot = "탐욕스러운 구더기" + L.pallid_gorger = "창백한 탐식자" + L.banquet_steward = "연회 집사" + L.crazed_marksman = "광기 어린 명사수" + L.maddened_survivalist = "광기의 생존주의자" + L.faceless_maiden = "얼굴 없는 여인" + L.marked_sister = "징표 찍힌 자매" + L.matron_alma = "대모 알마" + L.heartsbane_soulcharmer = "심장파멸 영혼매혹사" end L = BigWigs:NewBossLocale("Gorak Tul", "koKR") diff --git a/BfA/WaycrestManor/Locales/ptBR.lua b/BfA/WaycrestManor/Locales/ptBR.lua index ee440c5cb..05b69fd7c 100644 --- a/BfA/WaycrestManor/Locales/ptBR.lua +++ b/BfA/WaycrestManor/Locales/ptBR.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "ptBR") if not L then return end if L then - L.steward = "Senescal do Banquete" - L.gorger = "Devorador Pálido" - L.marksman = "Atirador Perito Enlouquecido" - L.runeweaver = "Fiarruna Sangra-coração" - L.vinetwister = "Cipoeira Sangra-coração" - L.survivalist = "Sobrevivencialista Louco" - L.bryndle = "Máter Brinda" - L.thornshaper = "Molda-espinho do Conventículo" + L.heartsbane_runeweaver = "Fiarruna Sangra-coração" + L.bewitched_captain = "Capitão Encantado" + L.thistle_acolyte = "Acólita do Cardo" + L.blight_toad = "Sapo Empesteado" + L.dreadwing_raven = "Corvo Terrorasa" + L.heartsbane_vinetwister = "Cipoeira Sangra-coração" + L.runic_disciple = "Discípula Rúnica" + L.coven_thornshaper = "Molda-espinho do Conventículo" L.thornguard = "Cardoguarda" - L.toad = "Sapo Empesteado" - L.raven = "Corvo Terrorasa" - L.soulcharmer = "Encantadeira Sangra-coração" - L.captain = "Capitão Encantado" - L.disciple = "Discípula Rúnica" - L.sister = "Irmã Marcada" - L.alma = "Máter Alma" + L.matron_bryndle = "Máter Brinda" + L.devouring_maggot = "Verme Devorador" + L.pallid_gorger = "Devorador Pálido" + L.banquet_steward = "Senescal do Banquete" + L.crazed_marksman = "Atirador Perito Enlouquecido" + L.maddened_survivalist = "Sobrevivencialista Louco" + L.faceless_maiden = "Donzela Sem-rosto" + L.marked_sister = "Irmã Marcada" + L.matron_alma = "Máter Alma" + L.heartsbane_soulcharmer = "Encantadeira Sangra-coração" end L = BigWigs:NewBossLocale("Gorak Tul", "ptBR") diff --git a/BfA/WaycrestManor/Locales/ruRU.lua b/BfA/WaycrestManor/Locales/ruRU.lua index e5c722a89..a5f5ec05f 100644 --- a/BfA/WaycrestManor/Locales/ruRU.lua +++ b/BfA/WaycrestManor/Locales/ruRU.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "ruRU") if not L then return end if L then - L.steward = "Распорядитель банкета" - L.gorger = "Бледный пожиратель" - L.marksman = "Обезумевший стрелок" - L.runeweaver = "Плетельщица рун из ковена Мертвых Сердец" - L.vinetwister = "Прядильщица лоз из ковена Мертвых Сердец" - L.survivalist = "Обезумевший мастер выживания" - L.bryndle = "Матрона Бриндл" - L.thornshaper = "Заклинательница шипов из ковена" + L.heartsbane_runeweaver = "Плетельщица рун из ковена Мертвых Сердец" + L.bewitched_captain = "Заколдованный капитан" + L.thistle_acolyte = "Ведьма-послушница" + L.blight_toad = "Чумная жаба" + L.dreadwing_raven = "Грознокрылый ворон" + L.heartsbane_vinetwister = "Прядильщица лоз из ковена Мертвых Сердец" + L.runic_disciple = "Руническая послушница" + L.coven_thornshaper = "Заклинательница шипов из ковена" L.thornguard = "Шипастый страж" - L.toad = "Чумная жаба" - L.raven = "Грознокрылый ворон" - L.soulcharmer = "Исказительница душ из ковена Мертвых Сердец" - L.captain = "Заколдованный капитан" - L.disciple = "Руническая послушница" - L.sister = "Меченая сестра" - L.alma = "Матрона Альма" + L.matron_bryndle = "Матрона Бриндл" + L.devouring_maggot = "Прожорливая личинка" + L.pallid_gorger = "Бледный пожиратель" + L.banquet_steward = "Распорядитель банкета" + L.crazed_marksman = "Обезумевший стрелок" + L.maddened_survivalist = "Обезумевший мастер выживания" + L.faceless_maiden = "Безликая дева" + L.marked_sister = "Меченая сестра" + L.matron_alma = "Матрона Альма" + L.heartsbane_soulcharmer = "Исказительница душ из ковена Мертвых Сердец" end L = BigWigs:NewBossLocale("Gorak Tul", "ruRU") diff --git a/BfA/WaycrestManor/Locales/zhCN.lua b/BfA/WaycrestManor/Locales/zhCN.lua index 0660de5ce..0d49042dc 100644 --- a/BfA/WaycrestManor/Locales/zhCN.lua +++ b/BfA/WaycrestManor/Locales/zhCN.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "zhCN") if not L then return end if L then - L.steward = "宴会招待员" - L.gorger = "苍白吞噬者" - L.marksman = "发狂的射手" - L.runeweaver = "毒心织符者" - L.vinetwister = "毒心藤蔓扭曲者" - L.survivalist = "疯狂的生存专家" - L.bryndle = "主母布琳德尔" - L.thornshaper = "女巫会塑棘者" + L.heartsbane_runeweaver = "毒心织符者" + L.bewitched_captain = "着魔的队长" + L.thistle_acolyte = "棘刺助祭" + L.blight_toad = "瘟疫蟾蜍" + L.dreadwing_raven = "恐翼渡鸦" + L.heartsbane_vinetwister = "毒心藤蔓扭曲者" + L.runic_disciple = "符文信徒" + L.coven_thornshaper = "女巫会塑棘者" L.thornguard = "荆棘卫士" - L.toad = "瘟疫蟾蜍" - L.raven = "恐翼渡鸦" - L.soulcharmer = "毒心诱魂者" - L.captain = "着魔的队长" - L.disciple = "符文信徒" - L.sister = "显眼的女巫" - L.alma = "主母阿尔玛" + L.matron_bryndle = "主母布琳德尔" + L.devouring_maggot = "贪吃的蛆虫" + L.pallid_gorger = "苍白吞噬者" + L.banquet_steward = "宴会招待员" + L.crazed_marksman = "发狂的射手" + L.maddened_survivalist = "疯狂的生存专家" + L.faceless_maiden = "无面女仆" + L.marked_sister = "显眼的女巫" + L.matron_alma = "主母阿尔玛" + L.heartsbane_soulcharmer = "毒心诱魂者" end L = BigWigs:NewBossLocale("Gorak Tul", "zhCN") diff --git a/BfA/WaycrestManor/Locales/zhTW.lua b/BfA/WaycrestManor/Locales/zhTW.lua index f06fdb618..9dadf0899 100644 --- a/BfA/WaycrestManor/Locales/zhTW.lua +++ b/BfA/WaycrestManor/Locales/zhTW.lua @@ -1,22 +1,25 @@ local L = BigWigs:NewBossLocale("Waycrest Manor Trash", "zhTW") if not L then return end if L then - L.steward = "宴會服務員" - L.gorger = "蒼白吞食者" - L.marksman = "瘋狂的神射手" - L.runeweaver = "禍心織符者" - L.vinetwister = "禍心盤藤者" - L.survivalist = "發狂的倖存者" - L.bryndle = "高階女巫布恩朵" - L.thornshaper = "塑棘女巫" + L.heartsbane_runeweaver = "禍心織符者" + L.bewitched_captain = "被蠱惑的隊長" + --L.thistle_acolyte = "Thistle Acolyte" + L.blight_toad = "荒疫蟾蜍" + L.dreadwing_raven = "懼翼烏鴉" + L.heartsbane_vinetwister = "禍心盤藤者" + L.runic_disciple = "符文門徒" + L.coven_thornshaper = "塑棘女巫" L.thornguard = "棘衛" - L.toad = "荒疫蟾蜍" - L.raven = "懼翼烏鴉" - L.soulcharmer = "禍心誘魂者" - L.captain = "被蠱惑的隊長" - L.disciple = "符文門徒" - L.sister = "符印女巫" - L.alma = "高階女巫艾爾瑪" + L.matron_bryndle = "高階女巫布恩朵" + --L.devouring_maggot = "Devouring Maggot" + L.pallid_gorger = "蒼白吞食者" + L.banquet_steward = "宴會服務員" + L.crazed_marksman = "瘋狂的神射手" + L.maddened_survivalist = "發狂的倖存者" + --L.faceless_maiden = "Faceless Maiden" + L.marked_sister = "符印女巫" + L.matron_alma = "高階女巫艾爾瑪" + L.heartsbane_soulcharmer = "禍心誘魂者" end L = BigWigs:NewBossLocale("Gorak Tul", "zhTW") diff --git a/BfA/WaycrestManor/Options/Colors.lua b/BfA/WaycrestManor/Options/Colors.lua index 7f93abafd..71913681c 100644 --- a/BfA/WaycrestManor/Options/Colors.lua +++ b/BfA/WaycrestManor/Options/Colors.lua @@ -49,24 +49,28 @@ BigWigs:AddColors("Waycrest Manor Trash", { [263961] = "yellow", [264038] = {"blue","orange"}, [264050] = "yellow", - [264105] = {"blue","orange","yellow"}, - [264150] = "red", + [264105] = {"blue","orange"}, + [264150] = "orange", [264390] = "red", [264396] = "yellow", + [264407] = "orange", [264456] = "yellow", [264520] = "yellow", - [264525] = "red", + [264525] = "orange", [264556] = "blue", [265346] = "orange", - [265352] = "red", + [265352] = "orange", [265368] = "cyan", - [265407] = "orange", + [265372] = "purple", + [265407] = "red", [265741] = "yellow", [265759] = "orange", [265760] = "red", [265876] = "red", [265880] = "orange", [265881] = "yellow", - [271174] = "yellow", + [266036] = "yellow", + [271174] = "orange", + [278444] = "yellow", [278474] = "red", }) diff --git a/BfA/WaycrestManor/Options/Sounds.lua b/BfA/WaycrestManor/Options/Sounds.lua index a2286d78c..c687b41ef 100644 --- a/BfA/WaycrestManor/Options/Sounds.lua +++ b/BfA/WaycrestManor/Options/Sounds.lua @@ -44,22 +44,24 @@ BigWigs:AddSounds("Gorak Tul", { BigWigs:AddSounds("Waycrest Manor Trash", { [263891] = {"alarm","warning"}, [263905] = "alert", - [263943] = "warning", + [263943] = "alert", [263959] = "warning", - [263961] = "alert", + [263961] = "info", [264038] = "alarm", [264050] = "alert", - [264105] = {"alert","warning"}, - [264150] = "alert", + [264105] = "alarm", + [264150] = "alarm", [264390] = "warning", [264396] = "alert", + [264407] = "warning", [264456] = "alert", [264520] = "alert", [264525] = "alarm", - [264556] = "alarm", + [264556] = "alert", [265346] = "alarm", - [265352] = "alert", + [265352] = "alarm", [265368] = "alert", + [265372] = "alarm", [265407] = "warning", [265741] = "alert", [265759] = "warning", @@ -67,6 +69,8 @@ BigWigs:AddSounds("Waycrest Manor Trash", { [265876] = "warning", [265880] = "alarm", [265881] = "alert", - [271174] = "alert", + [266036] = "alert", + [271174] = "alarm", + [278444] = "warning", [278474] = "alert", }) diff --git a/BfA/WaycrestManor/Trash.lua b/BfA/WaycrestManor/Trash.lua index 370733da9..f7a1ad34c 100644 --- a/BfA/WaycrestManor/Trash.lua +++ b/BfA/WaycrestManor/Trash.lua @@ -1,4 +1,3 @@ - -------------------------------------------------------------------------------- -- Module Declaration -- @@ -7,22 +6,25 @@ local mod, CL = BigWigs:NewBoss("Waycrest Manor Trash", 1862) if not mod then return end mod.displayName = CL.trash mod:RegisterEnableMob( - 131586, -- Banquet Steward - 137830, -- Pallid Gorger - 131849, -- Crazed Marksman 131677, -- Heartsbane Runeweaver - 131670, -- Heartsbane Vinetwister - 131850, -- Maddened Survivalist - 135329, -- Matron Bryndle - 131666, -- Coven Thornshaper - 131858, -- Thornguard + 131587, -- Bewitched Captain + 135474, -- Thistle Acolyte 135052, -- Blight Toad 135049, -- Dreadwing Raven - 131812, -- Heartsbane Soulcharmer - 131587, -- Bewitched Captain + 131670, -- Heartsbane Vinetwister 131685, -- Runic Disciple + 131666, -- Coven Thornshaper + 131858, -- Thornguard + 135329, -- Matron Bryndle + 134024, -- Devouring Maggot + 137830, -- Pallid Gorger + 131586, -- Banquet Steward + 131849, -- Crazed Marksman + 131850, -- Maddened Survivalist + 131821, -- Faceless Maiden 131818, -- Marked Sister - 135365 -- Matron Alma + 135365, -- Matron Alma + 131812 -- Heartsbane Soulcharmer ) -------------------------------------------------------------------------------- @@ -31,22 +33,25 @@ mod:RegisterEnableMob( local L = mod:GetLocale() if L then - L.steward = "Banquet Steward" - L.gorger = "Pallid Gorger" - L.marksman = "Crazed Marksman" - L.runeweaver = "Heartsbane Runeweaver" - L.vinetwister = "Heartsbane Vinetwister" - L.survivalist = "Maddened Survivalist" - L.bryndle = "Matron Bryndle" - L.thornshaper = "Coven Thornshaper" + L.heartsbane_runeweaver = "Heartsbane Runeweaver" + L.bewitched_captain = "Bewitched Captain" + L.thistle_acolyte = "Thistle Acolyte" + L.blight_toad = "Blight Toad" + L.dreadwing_raven = "Dreadwing Raven" + L.heartsbane_vinetwister = "Heartsbane Vinetwister" + L.runic_disciple = "Runic Disciple" + L.coven_thornshaper = "Coven Thornshaper" L.thornguard = "Thornguard" - L.toad = "Blight Toad" - L.raven = "Dreadwing Raven" - L.soulcharmer = "Heartsbane Soulcharmer" - L.captain = "Bewitched Captain" - L.disciple = "Runic Disciple" - L.sister = "Marked Sister" - L.alma = "Matron Alma" + L.matron_bryndle = "Matron Bryndle" + L.devouring_maggot = "Devouring Maggot" + L.pallid_gorger = "Pallid Gorger" + L.banquet_steward = "Banquet Steward" + L.crazed_marksman = "Crazed Marksman" + L.maddened_survivalist = "Maddened Survivalist" + L.faceless_maiden = "Faceless Maiden" + L.marked_sister = "Marked Sister" + L.matron_alma = "Matron Alma" + L.heartsbane_soulcharmer = "Heartsbane Soulcharmer" end -------------------------------------------------------------------------------- @@ -55,24 +60,23 @@ end function mod:GetOptions() return { - -- Banquet Steward - 265407, -- Dinner Bell - -- Pallid Gorger - 271174, -- Retch - -- Crazed Marksman - 264456, -- Tracking Explosive -- Heartsbane Runeweaver 263943, -- Etch 263905, -- Marking Cleave + -- Bewitched Captain + 265368, -- Spirited Defense + 265372, -- Shadow Cleave + -- Thistle Acolyte + 266036, -- Drain Essence + -- Blight Toad + 265352, -- Toad Blight + -- Dreadwing Raven + 265346, -- Pallid Glare -- Heartsbane Vinetwister 263891, -- Grasping Thorns - -- Maddened Survivalist - 264525, -- Shrapnel Trap - 264520, -- Severing Serpent - -- Matron Bryndle - 265759, -- Splinter Spike - 265760, -- Thorned Barrage - 265741, -- Drain Soul Essence + -- Runic Disciple + 264396, -- Spectral Talisman + 264390, -- Spellbind -- Coven Thornshaper 264050, -- Infected Thorn 278474, -- Effigy Reconstruction @@ -80,88 +84,119 @@ function mod:GetOptions() -- Thornguard 264556, -- Tearing Strike 264150, -- Shatter - -- Blight Toad - 265352, -- Toad Blight - -- Dreadwing Raven - 265346, -- Pallid Glare - -- Heartsbane Soulcharmer - 263959, -- Soul Volley - 263961, -- Warding Candles - -- Bewitched Captain - 265368, -- Spirited Defense - -- Runic Disciple - 264396, -- Spectral Talisman - 264390, -- Spellbind + -- Matron Bryndle + 265759, -- Splinter Spike + 265760, -- Thorned Barrage + 265741, -- Drain Soul Essence + -- Devouring Maggot + 278444, -- Infest + -- Pallid Gorger + 271174, -- Retch + -- Banquet Steward + 265407, -- Dinner Bell + -- Crazed Marksman + 264456, -- Tracking Explosive + -- Maddened Survivalist + 264525, -- Shrapnel Trap + 264520, -- Severing Serpent + -- Faceless Maiden + 264407, -- Horrific Visage -- Marked Sister {264105, "SAY", "SAY_COUNTDOWN"}, -- Runic Mark -- Matron Alma 265876, -- Ruinous Volley {265880, "SAY", "SAY_COUNTDOWN"}, -- Dread Mark 265881, -- Decaying Touch + -- Heartsbane Soulcharmer + 263959, -- Soul Volley + 263961, -- Warding Candles }, { - [265407] = L.steward, - [271174] = L.gorger, - [264456] = L.marksman, - [263943] = L.runeweaver, - [263891] = L.vinetwister, - [264525] = L.survivalist, - [265759] = L.bryndle, - [264050] = L.thornshaper, + [263943] = L.heartsbane_runeweaver, + [265368] = L.bewitched_captain, + [266036] = L.thistle_acolyte, + [265352] = L.blight_toad, + [265346] = L.dreadwing_raven, + [263891] = L.heartsbane_vinetwister, + [264396] = L.runic_disciple, + [264050] = L.coven_thornshaper, [264556] = L.thornguard, - [265352] = L.toad, - [265346] = L.raven, - [263959] = L.soulcharmer, - [265368] = L.captain, - [264396] = L.disciple, - [264105] = L.sister, - [265876] = L.alma, + [265759] = L.matron_bryndle, + [278444] = L.devouring_maggot, + [271174] = L.pallid_gorger, + [265407] = L.banquet_steward, + [264456] = L.crazed_marksman, + [264525] = L.maddened_survivalist, + [264407] = L.faceless_maiden, + [264105] = L.marked_sister, + [265876] = L.matron_alma, + [263959] = L.heartsbane_soulcharmer, } end function mod:OnBossEnable() - -- Banquet Steward - self:Log("SPELL_CAST_START", "DinnerBell", 265407) - -- Pallid Gorger - self:Log("SPELL_CAST_START", "Retch", 271174) - -- Crazed Marksman - self:Log("SPELL_CAST_START", "TrackingExplosive", 264456) -- Heartsbane Runeweaver self:Log("SPELL_CAST_SUCCESS", "Etch", 263943) self:Log("SPELL_CAST_START", "MarkingCleave", 263905) + + -- Bewitched Captain + self:Log("SPELL_CAST_START", "SpiritedDefense", 265368) + self:Log("SPELL_CAST_START", "ShadowCleave", 265372) + + -- Thistle Acolyte + self:Log("SPELL_CAST_START", "DrainEssence", 266036) + + -- Blight Toad + self:Log("SPELL_CAST_START", "ToadBlight", 265352) + + -- Dreadwing Raven + self:Log("SPELL_CAST_START", "PallidGlare", 265346) + -- Heartsbane Vinetwister self:Log("SPELL_CAST_START", "GraspingThorns", 263891) self:Log("SPELL_AURA_APPLIED", "GraspingThornsApplied", 263891) self:Log("SPELL_AURA_REMOVED", "GraspingThornsRemoved", 263891) - -- Maddened Survivalist - self:Log("SPELL_CAST_START", "ShrapnelTrap", 264525) - self:Log("SPELL_CAST_START", "SeveringSerpent", 264520) - -- Matron Bryndle - self:Log("SPELL_CAST_SUCCESS", "SplinterSpike", 265759) - self:Log("SPELL_CAST_START", "ThornedBarrage", 265760) - self:Log("SPELL_CAST_START", "DrainSoulEssence", 265741) + + -- Runic Disciple + self:Log("SPELL_CAST_START", "SpectralTalisman", 264396) + self:Log("SPELL_CAST_START", "Spellbind", 264390) + -- Coven Thornshaper self:Log("SPELL_CAST_START", "InfectedThorn", 264050) self:Log("SPELL_CAST_START", "EffigyReconstruction", 278474) self:Log("SPELL_CAST_START", "Uproot", 264038) + -- Thornguard self:Log("SPELL_AURA_APPLIED", "TearingStrike", 264556) self:Log("SPELL_CAST_START", "Shatter", 264150) - -- Blight Toad - self:Log("SPELL_CAST_START", "ToadBlight", 265352) - -- Dreadwing Raven - self:Log("SPELL_CAST_START", "PallidGlare", 265346) - -- Heartsbane Soulcharmer - self:Log("SPELL_CAST_START", "SoulVolley", 263959) - self:Log("SPELL_CAST_START", "WardingCandles", 263961) - -- Bewitched Captain - self:Log("SPELL_CAST_START", "SpiritedDefense", 265368) - -- Runic Disciple - self:Log("SPELL_CAST_START", "SpectralTalisman", 264396) - self:Log("SPELL_CAST_START", "Spellbind", 264390) + + -- Matron Bryndle + self:Log("SPELL_CAST_SUCCESS", "SplinterSpike", 265759) + self:Log("SPELL_CAST_START", "ThornedBarrage", 265760) + self:Log("SPELL_CAST_START", "DrainSoulEssence", 265741) + + -- Devouring Maggot + self:Log("SPELL_CAST_START", "Infest", 278444) + + -- Pallid Gorger + self:Log("SPELL_CAST_START", "Retch", 271174) + + -- Banquet Steward + self:Log("SPELL_CAST_START", "DinnerBell", 265407) + + -- Crazed Marksman + self:Log("SPELL_CAST_START", "TrackingExplosive", 264456) + + -- Maddened Survivalist + self:Log("SPELL_CAST_START", "ShrapnelTrap", 264525) + self:Log("SPELL_CAST_START", "SeveringSerpent", 264520) + + -- Faceless Maiden + self:Log("SPELL_CAST_START", "HorrificVisage", 264407) + -- Marked Sister - self:Log("SPELL_CAST_START", "RunicMark", 264105) self:Log("SPELL_AURA_APPLIED", "RunicMarkApplied", 264105) self:Log("SPELL_AURA_REMOVED", "RunicMarkRemoved", 264105) + -- Matron Alma self:Log("SPELL_CAST_START", "RuinousVolley", 265876) self:Log("SPELL_CAST_SUCCESS", "DreadMark", 265880) @@ -169,58 +204,78 @@ function mod:OnBossEnable() self:Log("SPELL_AURA_REMOVED", "DreadMarkRemoved", 265880) self:Log("SPELL_CAST_START", "DecayingTouch", 265881) + -- Heartsbane Soulcharmer + self:Log("SPELL_CAST_START", "SoulVolley", 263959) + self:Log("SPELL_CAST_START", "WardingCandles", 263961) end -------------------------------------------------------------------------------- -- Event Handlers -- --- Banquet Steward -do - local prev = 0 - function mod:DinnerBell(args) - local t = args.time - if t-prev > 1.5 then - prev = t - self:Message(args.spellId, "orange") - self:PlaySound(args.spellId, "warning") - end +-- Heartsbane Runeweaver + +function mod:Etch(args) + if self:Me(args.destGUID) or self:Healer() then + self:TargetMessage(args.spellId, "orange", args.destName) + self:PlaySound(args.spellId, "alert", nil, args.destName) end end --- Pallid Gorger +function mod:MarkingCleave(args) + self:Message(args.spellId, "yellow") + self:PlaySound(args.spellId, "alert") +end + +-- Bewitched Captain + +function mod:SpiritedDefense(args) + self:Message(args.spellId, "cyan", CL.casting:format(args.spellName)) + self:PlaySound(args.spellId, "alert") +end + do local prev = 0 - function mod:Retch(args) + function mod:ShadowCleave(args) local t = args.time - if t-prev > 1.5 then + if t - prev > 1.5 then prev = t - self:Message(args.spellId, "yellow") - self:PlaySound(args.spellId, "alert") + self:Message(args.spellId, "purple") + self:PlaySound(args.spellId, "alarm") end end end --- Crazed Marksman -function mod:TrackingExplosive(args) - self:Message(args.spellId, "yellow") +-- Thistle Acolyte + +function mod:DrainEssence(args) + self:Message(args.spellId, "yellow", CL.casting:format(args.spellName)) self:PlaySound(args.spellId, "alert") end --- Heartsbane Runeweaver -function mod:Etch(args) - self:TargetMessage(args.spellId, "orange", args.destName) - if self:Me(args.destGUID) or self:Healer() then - self:PlaySound(args.spellId, "warning", nil, args.destName) +-- Blight Toad + +do + local prev = 0 + function mod:ToadBlight(args) + local t = args.time + if t - prev > 1.5 then + prev = t + self:Message(args.spellId, "orange") + self:PlaySound(args.spellId, "alarm") + end end end -function mod:MarkingCleave(args) - self:Message(args.spellId, "yellow") - self:PlaySound(args.spellId, "alert") +-- Dreadwing Raven + +function mod:PallidGlare(args) + self:Message(args.spellId, "orange", CL.casting:format(args.spellName)) + self:PlaySound(args.spellId, "alarm") end -- Heartsbane Vinetwister + function mod:GraspingThorns(args) self:Message(args.spellId, "yellow", CL.casting:format(args.spellName)) @@ -242,55 +297,27 @@ function mod:GraspingThornsRemoved(args) self:StopBar(args.spellName, args.destName) end --- Maddened Survivalist -do - local prev = 0 - function mod:ShrapnelTrap(args) - local t = args.time - if t-prev > 1.5 then - prev = t - self:Message(args.spellId, "red") - self:PlaySound(args.spellId, "alarm") - end - end -end +-- Runic Disciple -do - local prev = 0 - function mod:SeveringSerpent(args) - local t = args.time - if t-prev > 1.5 then - prev = t - self:Message(args.spellId, "yellow") - self:PlaySound(args.spellId, "alert") - end - end +function mod:SpectralTalisman(args) + self:Message(args.spellId, "yellow") + self:PlaySound(args.spellId, "alert") end --- Matron Bryndle -function mod:SplinterSpike(args) - self:Message(args.spellId, "orange") +function mod:Spellbind(args) + self:Message(args.spellId, "red", CL.casting:format(args.spellName)) self:PlaySound(args.spellId, "warning") end -function mod:ThornedBarrage(args) - self:Message(args.spellId, "red") - self:PlaySound(args.spellId, "alarm") -end - -function mod:DrainSoulEssence(args) - self:Message(args.spellId, "yellow") - self:PlaySound(args.spellId, "alert") -end - -- Coven Thornshaper + do local prev = 0 function mod:InfectedThorn(args) local t = args.time - if t-prev > 1.5 then + if t - prev > 1.5 then prev = t - self:Message(args.spellId, "yellow") + self:Message(args.spellId, "yellow", CL.casting:format(args.spellName)) self:PlaySound(args.spellId, "alert") end end @@ -316,15 +343,17 @@ do end -- Thornguard + do local prev = 0 function mod:TearingStrike(args) + -- TODO seems to just go on tank, very frequently, probably just remove this if self:Me(args.destGUID) then local t = args.time - if t-prev > 1.5 then + if t - prev > 1.5 then prev = t self:PersonalMessage(args.spellId) - self:PlaySound(args.spellId, "alarm") + self:PlaySound(args.spellId, "alert") end end end @@ -334,71 +363,119 @@ do local prev = 0 function mod:Shatter(args) local t = args.time - if t-prev > 1.5 then + if t - prev > 1.5 then prev = t - self:Message(args.spellId, "red") - self:PlaySound(args.spellId, "alert") + self:Message(args.spellId, "orange") + self:PlaySound(args.spellId, "alarm") end end end --- Blight Toad +-- Matron Bryndle + +function mod:SplinterSpike(args) + self:Message(args.spellId, "orange") + self:PlaySound(args.spellId, "warning") +end + +function mod:ThornedBarrage(args) + self:Message(args.spellId, "red") + self:PlaySound(args.spellId, "alarm") +end + +function mod:DrainSoulEssence(args) + self:Message(args.spellId, "yellow") + self:PlaySound(args.spellId, "alert") +end + +-- Devouring Maggot + do local prev = 0 - function mod:ToadBlight(args) + function mod:Infest(args) local t = args.time - if t-prev > 1.5 then + if t - prev > 1.5 then prev = t - self:Message(args.spellId, "red") - self:PlaySound(args.spellId, "alert") + self:Message(args.spellId, "yellow", CL.casting:format(args.spellName)) + self:PlaySound(args.spellId, "warning") end end end --- Dreadwing Raven -function mod:PallidGlare(args) - self:Message(args.spellId, "orange") - self:PlaySound(args.spellId, "alarm") +-- Pallid Gorger + +do + local prev = 0 + function mod:Retch(args) + local t = args.time + if t - prev > 1.5 then + prev = t + self:Message(args.spellId, "orange") -- TODO purple? + self:PlaySound(args.spellId, "alarm") + end + end end --- Heartsbane Soulcharmer -function mod:SoulVolley(args) - self:Message(args.spellId, "red") - self:PlaySound(args.spellId, "warning") +-- Banquet Steward + +do + local prev = 0 + function mod:DinnerBell(args) + local t = args.time + if t - prev > 1.5 then + prev = t + self:Message(args.spellId, "red") + self:PlaySound(args.spellId, "warning") + end + end end -function mod:WardingCandles(args) +-- Crazed Marksman + +function mod:TrackingExplosive(args) self:Message(args.spellId, "yellow") self:PlaySound(args.spellId, "alert") end --- Bewitched Captain -function mod:SpiritedDefense(args) - self:Message(args.spellId, "cyan") - self:PlaySound(args.spellId, "alert") +-- Maddened Survivalist + +do + local prev = 0 + function mod:ShrapnelTrap(args) + local t = args.time + if t - prev > 1.5 then + prev = t + self:Message(args.spellId, "orange") + self:PlaySound(args.spellId, "alarm") + end + end end --- Runic Disciple -function mod:SpectralTalisman(args) - self:Message(args.spellId, "yellow") - self:PlaySound(args.spellId, "alert") +do + local prev = 0 + function mod:SeveringSerpent(args) + local t = args.time + if t - prev > 1.5 then + prev = t + self:Message(args.spellId, "yellow", CL.casting:format(args.spellName)) + self:PlaySound(args.spellId, "alert") + end + end end -function mod:Spellbind(args) - self:Message(args.spellId, "red") +-- Faceless Maiden + +function mod:HorrificVisage(args) + self:Message(args.spellId, "orange", CL.casting:format(args.spellName)) self:PlaySound(args.spellId, "warning") end -- Marked Sister -function mod:RunicMark(args) - self:Message(args.spellId, "yellow") - self:PlaySound(args.spellId, "alert") -end function mod:RunicMarkApplied(args) self:TargetMessage(args.spellId, "orange", args.destName) + self:PlaySound(args.spellId, "alarm", nil, args.destName) if self:Me(args.destGUID) then - self:PlaySound(args.spellId, "warning") self:Say(args.spellId) self:SayCountdown(args.spellId, 6) end @@ -411,6 +488,7 @@ function mod:RunicMarkRemoved(args) end -- Matron Alma + function mod:RuinousVolley(args) self:Message(args.spellId, "red") self:PlaySound(args.spellId, "warning") @@ -438,3 +516,15 @@ function mod:DecayingTouch(args) self:Message(args.spellId, "yellow") self:PlaySound(args.spellId, "alert") end + +-- Heartsbane Soulcharmer + +function mod:SoulVolley(args) + self:Message(args.spellId, "red", CL.casting:format(args.spellName)) + self:PlaySound(args.spellId, "warning") +end + +function mod:WardingCandles(args) + self:Message(args.spellId, "yellow") + self:PlaySound(args.spellId, "info") +end