From d333b8c8d89009c8dcc17b9e7a78256251778432 Mon Sep 17 00:00:00 2001 From: Pavel Dovlatov Date: Fri, 5 Aug 2022 00:45:47 +0300 Subject: [PATCH] [DSR] Added Reef Heart spawn alert at the Reef Guardian boss fight --- BuffsDebuffs.lua | 2 ++ Settings.lua | 6 ++++++ TrialDreadsailReef.lua | 14 ++++++++++++++ lang/en.lua | 3 +++ 4 files changed, 25 insertions(+) diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua index 62922f1..3f11249 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -655,6 +655,8 @@ dreadsail_reef.turlassil_imminent_chill = 168526 dreadsail_reef.lylanar_broiling_hew = 167273 -- Turlassil's Heavy Attack dreadsail_reef.turlassil_stinging_shear = 167280 +-- Reef Guardian's cast on Reef Heart +dreadsail_reef.reef_guardian_heartburn = 163692 -- Tideborn Taleria's Rapid Deluge dreadsail_reef.taleria_rapid_deluge = { [174959] = true, -- Normal diff --git a/Settings.lua b/Settings.lua index d4cdee3..8df30ec 100644 --- a/Settings.lua +++ b/Settings.lua @@ -320,6 +320,7 @@ do ------------------ dreadsailReef = { imminent_debuffs = false, brothers_heavy_attack = 0, -- "Off" + reef_guardian_reef_heart = false, taleria_rapid_deluge = 0, -- "Off" }, dbg = { @@ -1731,6 +1732,11 @@ function RaidNotifier:CreateSettingsMenu() tooltip = L.Settings_DreadsailReef_Brothers_Heavy_Attack_TT, choices = choices.dreadsailReef.brothers_heavy_attack, }, "dreadsailReef", "brothers_heavy_attack") + MakeControlEntry({ + type = "checkbox", + name = L.Settings_DreadsailReef_ReefGuardian_ReefHeart, + tooltip = L.Settings_DreadsailReef_ReefGuardian_ReefHeart_TT, + }, "dreadsailReef", "reef_guardian_reef_heart") MakeControlEntry({ type = "dropdown", name = L.Settings_DreadsailReef_Rapid_Deluge, diff --git a/TrialDreadsailReef.lua b/TrialDreadsailReef.lua index bd782f5..8800fc8 100644 --- a/TrialDreadsailReef.lua +++ b/TrialDreadsailReef.lua @@ -13,6 +13,13 @@ function RaidNotifier.DSR.Initialize() dbg = RaidNotifier.dbg data = {} + data.reefHeartCounter = 0 +end + +function RaidNotifier.DSR.OnCombatStateChanged(inCombat) + if inCombat then + data.reefHeartCounter = 0 + end end function RaidNotifier.DSR.OnCombatEvent(_, result, isError, aName, aGraphic, aActionSlotType, sName, sType, tName, tType, hitValue, pType, dType, log, sUnitId, tUnitId, abilityId) @@ -39,6 +46,13 @@ function RaidNotifier.DSR.OnCombatEvent(_, result, isError, aName, aGraphic, aAc elseif (settings.brothers_heavy_attack == 2 and tName ~= "") then self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_DREADSAILREEF_STINGING_SHEAR_OTHER), tName), "dreadsailReef", "brothers_heavy_attack") end + elseif (abilityId == buffsDebuffs.reef_guardian_heartburn and settings.reef_guardian_reef_heart) then + data.reefHeartCounter = data.reefHeartCounter + 1 + self:AddAnnouncement( + zo_strformat(GetString(RAIDNOTIFIER_ALERTS_DREADSAILREEF_REEFGUARDIAN_REEFHEART), data.reefHeartCounter), + "dreadsailReef", + "reef_guardian_reef_heart" + ) end elseif (result == ACTION_RESULT_EFFECT_GAINED_DURATION) then -- Lylanar's Imminent Blister debuff diff --git a/lang/en.lua b/lang/en.lua index cf89f35..c20c246 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -634,6 +634,8 @@ L.Settings_DreadsailReef_Imminent_Debuffs = "Lylanar & Turlassil: Immin L.Settings_DreadsailReef_Imminent_Debuffs_TT = "Alerts you when tank receives Imminent Blister debuff from Lylanar or Imminent Chill debuff from Turlassil. Tanks should swap in 10 seconds." L.Settings_DreadsailReef_Brothers_Heavy_Attack = "Lylanar & Turlassil: Heavy attack" L.Settings_DreadsailReef_Brothers_Heavy_Attack_TT = "Alerts you when Lylanar or Turlassil makes their heavy attack (Broiling Hew / Stinging Shear)." +L.Settings_DreadsailReef_ReefGuardian_ReefHeart = "Reef Guardian: Reef Heart spawn" +L.Settings_DreadsailReef_ReefGuardian_ReefHeart_TT = "Alerts you when Reef Heart appears. You have 60 seconds to kill it or it's a group wipe. There can be several Hearts active at the same time." L.Settings_DreadsailReef_Rapid_Deluge = "Taleria: Rapid Deluge" L.Settings_DreadsailReef_Rapid_Deluge_TT = "Alerts you when you or someone got Rapid Deluge debuff. They'll explode in 6 seconds, and the best option to handle the damage is to be swimming at that time." @@ -646,6 +648,7 @@ L.Alerts_DreadsailReef_Broiling_Hew = "Incoming |cCDCDCDBroiling L.Alerts_DreadsailReef_Broiling_Hew_Other = "Incoming |cCDCDCDBroiling Hew|r on |cFF0000<>|r!" L.Alerts_DreadsailReef_Stinging_Shear = "Incoming |cCDCDCDStinging Shear|r on you!" L.Alerts_DreadsailReef_Stinging_Shear_Other = "Incoming |cCDCDCDStinging Shear|r on |cFF0000<>|r!" +L.Alerts_DreadsailReef_ReefGuardian_ReefHeart = "Reef Heart #|cFF0000<<1>>|r spawned!" L.Alerts_DreadsailReef_Rapid_Deluge = "You got |c1CA3ECRapid Deluge|r! You should be swimming in" L.Alerts_DreadsailReef_Rapid_Deluge_Other = "|cFF0000<>|r got |c1CA3ECRapid Deluge|r! Swim in"