From ee79859f18e4a90710ac8f9fff653d66ce063247 Mon Sep 17 00:00:00 2001 From: Arrvis the Lion Date: Mon, 13 Sep 2021 18:51:10 +0300 Subject: [PATCH] [RG] Added Bahsei's Embrace of Death countdown --- BuffsDebuffs.lua | 2 ++ Settings.lua | 8 ++++++++ TrialRockgrove.lua | 11 +++++++++++ lang/en.lua | 4 ++++ 4 files changed, 25 insertions(+) diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua index 251ce3a..c0a35dc 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -633,5 +633,7 @@ rockgrove.meteor_radiating_heat = { [152462] = true, -- on trash [157383] = true, -- on second boss } +-- Flame-Herald Bahsei's Death Touch debuff (caused by Embrace of Death mech) +rockgrove.bahsei_death_touch = 150078 RaidNotifier.BuffsDebuffs[RAID_ROCKGROVE] = rockgrove diff --git a/Settings.lua b/Settings.lua index 0b3b262..4949f16 100644 --- a/Settings.lua +++ b/Settings.lua @@ -308,6 +308,7 @@ do ------------------ prime_meteor = false, havocrel_barbarian_hasted_assault = false, oaxiltso_savage_blitz = false, + bahsei_embrace_of_death = 0, -- "Off" }, dbg = { enable = false, @@ -552,6 +553,7 @@ function RaidNotifier:CreateSettingsMenu() }, rockgrove = { sulxan_reaver_sundering_strike = off_self_all, + bahsei_embrace_of_death = off_self_all, }, } @@ -1646,6 +1648,12 @@ function RaidNotifier:CreateSettingsMenu() name = L.Settings_Rockgrove_Savage_Blitz, tooltip = L.Settings_Rockgrove_Savage_Blitz_TT, }, "rockgrove", "oaxiltso_savage_blitz") + MakeControlEntry({ + type = "dropdown", + name = L.Settings_Rockgrove_Embrace_Of_Death, + tooltip = L.Settings_Rockgrove_Embrace_Of_Death_TT, + choices = choices.rockgrove.bahsei_embrace_of_death, + }, "rockgrove", "bahsei_embrace_of_death") subTable = nil --end submenu MakeControlEntry({ diff --git a/TrialRockgrove.lua b/TrialRockgrove.lua index 4f86384..3c4b1ec 100644 --- a/TrialRockgrove.lua +++ b/TrialRockgrove.lua @@ -30,6 +30,17 @@ function RaidNotifier.RG.OnEffectChanged(eventCode, changeType, eSlot, eName, uT end end end + -- Flame-Herald Bahsei's Embrace of Death (Death Touch debuff) + elseif (abilityId == buffsDebuffs.bahsei_death_touch and string.sub(uTag, 1, 5) == "group") then + if (changeType == EFFECT_RESULT_GAINED) then + if (settings.bahsei_embrace_of_death >= 1 and AreUnitsEqual(uTag, "player")) then + self:StartCountdown(8000, GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_EMBRACE_OF_DEATH), "rockgrove", "bahsei_embrace_of_death", true) + elseif (settings.bahsei_embrace_of_death == 2) then + local targetPlayerName = self.UnitIdToString(uId) + + self:StartCountdown(8000, zo_strformat(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_EMBRACE_OF_DEATH_OTHER), targetPlayerName), "rockgrove", "bahsei_embrace_of_death", true) + end + end end end diff --git a/lang/en.lua b/lang/en.lua index 978175b..2087f19 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -589,6 +589,8 @@ L.Settings_Rockgrove_Hasted_Assault = "General: Hasted Assault" L.Settings_Rockgrove_Hasted_Assault_TT = "Alerts you when the Havocrel Barbarian makes Hasted Assault attack. He teleports from player to player in random order and attacks them. This should be blocked." L.Settings_Rockgrove_Savage_Blitz = "Oaxiltso: Savage Blitz" L.Settings_Rockgrove_Savage_Blitz_TT = "Alerts you when the Oaxiltso charges at the furthest player." +L.Settings_Rockgrove_Embrace_Of_Death = "Flame-Herald Bahsei: Embrace of Death" +L.Settings_Rockgrove_Embrace_Of_Death_TT = "Alerts you when someone got cursed by Flame-Herald Bahsei. That person will explode after 8 seconds, spreading the curse. It's important to keep cursed player separated from the group." -- Alerts L.Alerts_Rockgrove_Sundering_Strike = "Incoming |cCDCDCDSundering Strike|r on you!" @@ -600,6 +602,8 @@ L.Alerts_Rockgrove_Soul_Extraction = "Incoming Soul Extraction o L.Alerts_Rockgrove_Prime_Meteor = "|cFFD600Prime Meteor|r will explode in" L.Alerts_Rockgrove_Hasted_Assault = "Incoming |cFF0000Hasted Assault|r! Block!" L.Alerts_Rockgrove_Savage_Blitz = "Oaxiltso charges at |cFF0000<>|r!" +L.Alerts_Rockgrove_Embrace_Of_Death = "You're cursed by |c370073Embrace of Death|r! Stay away! Explosion in" +L.Alerts_Rockgrove_Embrace_Of_Death_Other = "|cFF0000<>|r cursed by |c370073Embrace of Death|r! Explosion in" --------------------------------