From fd5c2bd74de495ede6c88d66591c9133949b9d96 Mon Sep 17 00:00:00 2001 From: Arrvis the Lion Date: Mon, 13 Sep 2021 19:04:24 +0300 Subject: [PATCH] [RG] Added Oaxiltso's Noxious Sludge announcement --- 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 c0a35dc..a807fed 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -628,6 +628,8 @@ rockgrove.oaxiltso_savage_blitz = { [149414] = true, [157932] = true, } +-- Oaxiltso's Noxious Sludge +rockgrove.oaxiltso_noxious_sludge = 157860 -- Radiating Heat (player gains this effect while Prime Meteor is present) rockgrove.meteor_radiating_heat = { [152462] = true, -- on trash diff --git a/Settings.lua b/Settings.lua index 4949f16..f9cc173 100644 --- a/Settings.lua +++ b/Settings.lua @@ -308,6 +308,7 @@ do ------------------ prime_meteor = false, havocrel_barbarian_hasted_assault = false, oaxiltso_savage_blitz = false, + oaxiltso_noxious_sludge = 0, -- "Off" bahsei_embrace_of_death = 0, -- "Off" }, dbg = { @@ -553,6 +554,7 @@ function RaidNotifier:CreateSettingsMenu() }, rockgrove = { sulxan_reaver_sundering_strike = off_self_all, + oaxiltso_noxious_sludge = off_self_all, bahsei_embrace_of_death = off_self_all, }, } @@ -1648,6 +1650,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_Noxious_Sludge, + tooltip = L.Settings_Rockgrove_Noxious_Sludge_TT, + choices = choices.rockgrove.oaxiltso_noxious_sludge, + }, "rockgrove", "oaxiltso_noxious_sludge") MakeControlEntry({ type = "dropdown", name = L.Settings_Rockgrove_Embrace_Of_Death, diff --git a/TrialRockgrove.lua b/TrialRockgrove.lua index 3c4b1ec..65c359a 100644 --- a/TrialRockgrove.lua +++ b/TrialRockgrove.lua @@ -30,6 +30,17 @@ function RaidNotifier.RG.OnEffectChanged(eventCode, changeType, eSlot, eName, uT end end end + -- Oaxiltso's Noxious Sludge + elseif (abilityId == buffsDebuffs.oaxiltso_noxious_sludge and string.sub(uTag, 1, 5) == "group") then + if (changeType == EFFECT_RESULT_GAINED) then + if (settings.oaxiltso_noxious_sludge >= 1 and AreUnitsEqual(uTag, "player")) then + self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_NOXIOUS_SLUDGE), "rockgrove", "oaxiltso_noxious_sludge") + elseif (settings.oaxiltso_noxious_sludge == 2) then + local targetPlayerName = self.UnitIdToString(uId) + + self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_NOXIOUS_SLUDGE_OTHER), targetPlayerName), "rockgrove", "oaxiltso_noxious_sludge") + 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 diff --git a/lang/en.lua b/lang/en.lua index 2087f19..8fc6838 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_Noxious_Sludge = "Oaxiltso: Noxious Sludge" +L.Settings_Rockgrove_Noxious_Sludge_TT = "Alerts you when someone is poisoned by Oaxiltso and has to go cleanse in the pool." 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." @@ -602,6 +604,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_Noxious_Sludge = "You're poisoned by |c008C22Noxious Sludge|r! Cleanse in the pool!" +L.Alerts_Rockgrove_Noxious_Sludge_Other = "|cFF0000<>|r is poisoned by |c008C22Noxious Sludge|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"