From bb15cc85ecef1d62dae4a46ae3973438b56957d2 Mon Sep 17 00:00:00 2001 From: Arrvis the Lion Date: Fri, 10 Sep 2021 20:14:00 +0300 Subject: [PATCH] [RG] Added Havocrel Barbarian's Hasted Assault announcement --- BuffsDebuffs.lua | 5 +++++ Settings.lua | 6 ++++++ TrialRockgrove.lua | 5 +++++ lang/en.lua | 3 +++ 4 files changed, 19 insertions(+) diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua index 14ca496..9aa0688 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -618,5 +618,10 @@ rockgrove.sulxan_soulweaver_soul_extraction = { [158441] = true, [158442] = true, } +-- Havocrel Barbarian's Hasted Assault +rockgrove.havocrel_barbarian_hasted_assault = { + [149261] = true, + [149268] = true, +} RaidNotifier.BuffsDebuffs[RAID_ROCKGROVE] = rockgrove diff --git a/Settings.lua b/Settings.lua index ec3f78a..aca3f84 100644 --- a/Settings.lua +++ b/Settings.lua @@ -305,6 +305,7 @@ do ------------------ sulxan_reaver_sundering_strike = 0, -- "Off" sulxan_soulweaver_astral_shield = false, sulxan_soulweaver_soul_extraction = false, + havocrel_barbarian_hasted_assault = false, }, dbg = { enable = false, @@ -1628,6 +1629,11 @@ function RaidNotifier:CreateSettingsMenu() name = L.Settings_Rockgrove_Soul_Extraction, tooltip = L.Settings_Rockgrove_Soul_Extraction_TT, }, "rockgrove", "sulxan_soulweaver_soul_extraction") + MakeControlEntry({ + type = "checkbox", + name = L.Settings_Rockgrove_Hasted_Assault, + tooltip = L.Settings_Rockgrove_Hasted_Assault_TT, + }, "rockgrove", "havocrel_barbarian_hasted_assault") subTable = nil --end submenu MakeControlEntry({ diff --git a/TrialRockgrove.lua b/TrialRockgrove.lua index f9100bc..02e1921 100644 --- a/TrialRockgrove.lua +++ b/TrialRockgrove.lua @@ -42,6 +42,11 @@ function RaidNotifier.RG.OnCombatEvent(_, result, isError, aName, aGraphic, aAct if (settings.sulxan_soulweaver_soul_extraction and tType == COMBAT_UNIT_TYPE_PLAYER) then self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_SOUL_EXTRACTION), "rockgrove", "sulxan_soulweaver_soul_extraction") end + -- Havocrel Barbarian's Hasted Assault + elseif (buffsDebuffs.havocrel_barbarian_hasted_assault[abilityId]) then + if (settings.havocrel_barbarian_hasted_assault) then + self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_HASTED_ASSAULT), "rockgrove", "havocrel_barbarian_hasted_assault") + end end elseif (result == ACTION_RESULT_EFFECT_GAINED_DURATION) then -- Sul-Xan Soulweaver's Soul Extraction (Debug purpose only!) diff --git a/lang/en.lua b/lang/en.lua index 989e96f..bcade99 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -583,6 +583,8 @@ L.Settings_Rockgrove_Astral_Shield = "General: Astral Shield" L.Settings_Rockgrove_Astral_Shield_TT = "Alerts you when the Sul-Xan Soulweaver casts his Astral Shield, and when Soul Remnants affect you." L.Settings_Rockgrove_Soul_Extraction = "General: Soul Extraction" L.Settings_Rockgrove_Soul_Extraction_TT = "Alerts you when the Sul-Xan Soulweaver casts Soul Extraction on you." +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." -- Alerts L.Alerts_Rockgrove_Sundering_Strike = "Incoming |cCDCDCDSundering Strike|r on you!" @@ -591,6 +593,7 @@ L.Alerts_Rockgrove_Astral_Shield_Cast = "|cFFFF8FAstral Shield|r ha L.Alerts_Rockgrove_Soul_Remnant_Heavy = "|cFF0000Incoming|r |c8FF2FFSoul Remnant|r!" L.Alerts_Rockgrove_Soul_Remnant = "Incoming |c8FF2FFSoul Remnant|r!" L.Alerts_Rockgrove_Soul_Extraction = "Incoming Soul Extraction on you!" +L.Alerts_Rockgrove_Hasted_Assault = "Incoming |cFF0000Hasted Assault|r! Block!" --------------------------------