From 9966deca2b925431988798e84f900909d846dda9 Mon Sep 17 00:00:00 2001 From: Pavel Dovlatov Date: Sun, 28 May 2023 19:10:51 +0300 Subject: [PATCH] [RG] Added alert about cone direction at Bahsei HM encounter --- BuffsDebuffs.lua | 4 ++++ Settings.lua | 6 ++++++ TrialRockgrove.lua | 14 ++++++++++++++ lang/en.lua | 4 ++++ 4 files changed, 28 insertions(+) diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua index 8d74962..855026b 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -640,6 +640,10 @@ rockgrove.meteor_radiating_heat = { } -- Flame-Herald Bahsei's Death Touch debuff (caused by Embrace of Death mech) rockgrove.bahsei_death_touch = 150078 +-- Creeping Eye effect on Flame-Herald Bahsei's fight that indicated clockwise cone direction +rockgrove.bahsei_creeping_eye_clockwise = 153517 +-- Creeping Eye effect on Flame-Herald Bahsei's fight that indicated counterclockwise cone direction +rockgrove.bahsei_creeping_eye_countercw = 153518 RaidNotifier.BuffsDebuffs[RAID_ROCKGROVE] = rockgrove diff --git a/Settings.lua b/Settings.lua index 9f05612..6d597d0 100644 --- a/Settings.lua +++ b/Settings.lua @@ -317,6 +317,7 @@ do ------------------ oaxiltso_noxious_sludge = 0, -- "Off" oaxiltso_annihilator_cinder_cleave = 0, -- "Off" bahsei_embrace_of_death = 0, -- "Off" + bahsei_cone_direction = false, }, dreadsailReef = { dome_type = 3, -- "All" @@ -1740,6 +1741,11 @@ function RaidNotifier:CreateSettingsMenu() choices = choices.rockgrove.bahsei_embrace_of_death, choicesTooltips = { false, false, L.Settings_Rockgrove_Embrace_Of_Death_TT_All }, }, "rockgrove", "bahsei_embrace_of_death") + MakeControlEntry({ + type = "checkbox", + name = L.Settings_Rockgrove_Bahsei_Cone_Direction, + tooltip = L.Settings_Rockgrove_Bahsei_Cone_Direction_TT, + }, "rockgrove", "bahsei_cone_direction") subTable = nil --end submenu -- Dreadsail Reef diff --git a/TrialRockgrove.lua b/TrialRockgrove.lua index 6ac8fba..d7f965d 100644 --- a/TrialRockgrove.lua +++ b/TrialRockgrove.lua @@ -108,6 +108,20 @@ function RaidNotifier.RG.OnCombatEvent(_, result, isError, aName, aGraphic, aAct self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_CINDER_CLEAVE_OTHER), tName), "rockgrove", "oaxiltso_annihilator_cinder_cleave") end end + elseif (result == ACTION_RESULT_EFFECT_GAINED) then + if (abilityId == buffsDebuffs.bahsei_creeping_eye_clockwise or abilityId == buffsDebuffs.bahsei_creeping_eye_countercw) then + if (settings.bahsei_cone_direction) then + local text + + if (abilityId == buffsDebuffs.bahsei_creeping_eye_clockwise) then + text = GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_BAHSEI_CONE_DIRECTION_CLOCKWISE) + else + text = GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_BAHSEI_CONE_DIRECTION_COUNTERCW) + end + + self:AddAnnouncement(text, "rockgrove", "bahsei_cone_direction") + end + end elseif (result == ACTION_RESULT_EFFECT_FADED) then -- Sul-Xan Soulweaver's Soul Remnant attack (his Astral Shield is broken) if (abilityId == buffsDebuffs.sulxan_soulweaver_astral_shield_self) then diff --git a/lang/en.lua b/lang/en.lua index ff04087..f9bfcdb 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -613,6 +613,8 @@ L.Settings_Rockgrove_Cinder_Cleave_TT = "Alerts you when Havocrel A 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." L.Settings_Rockgrove_Embrace_Of_Death_TT_All = "|cFF0000WARNING!|r If your group will get too much curses your screen may be fully covered in countdowns for a duration of those curses! We're working on ways to improve this notification." +L.Settings_Rockgrove_Bahsei_Cone_Direction = "Flame-Herald Bahsei HM: Cone direction" +L.Settings_Rockgrove_Bahsei_Cone_Direction_TT = "Alerts you of the cone direction if the portal opened." -- Alerts L.Alerts_Rockgrove_Sundering_Strike = "Incoming |cCDCDCDSundering Strike|r on you!" @@ -629,6 +631,8 @@ L.Alerts_Rockgrove_Cinder_Cleave = "|cD74700Cinder Cleave|r on L.Alerts_Rockgrove_Cinder_Cleave_Other = "|cD74700Cinder Cleave|r on |cFF0000<>|r." L.Alerts_Rockgrove_Embrace_Of_Death = "You're cursed by |c0A929BEmbrace of Death|r! Stay away! Explosion in" L.Alerts_Rockgrove_Embrace_Of_Death_Other = "|cFF0000<>|r cursed by |c0A929BEmbrace of Death|r! Explosion in" +L.Alerts_Rockgrove_Bahsei_Cone_Direction_Clockwise = "-> Move |cF48020clockwise|r ->" +L.Alerts_Rockgrove_Bahsei_Cone_Direction_CounterCW = "<- Move |c15FFC2counterclockwise|r <-" --------------------------------