From 7159ce61a09b5f3ba7a1523cc333a4df5a9641c0 Mon Sep 17 00:00:00 2001 From: Pavel Dovlatov Date: Sat, 18 Jun 2022 13:26:57 +0300 Subject: [PATCH] [DSR] Added Taleria's Rapid Deluge countdown --- BuffsDebuffs.lua | 6 ++++++ Settings.lua | 8 ++++++++ TrialDreadsailReef.lua | 7 +++++++ lang/en.lua | 4 ++++ 4 files changed, 25 insertions(+) diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua index c858126..fe88c0f 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -651,5 +651,11 @@ local dreadsail_reef = {} dreadsail_reef.lylanar_imminent_blister = 168525 -- Turlassil's Imminent Chill debuff (will be followed by Chilling Fragility; attack ID = 166527) dreadsail_reef.turlassil_imminent_chill = 168526 +-- Tideborn Taleria's Rapid Deluge +dreadsail_reef.taleria_rapid_deluge = { + [174959] = true, -- Normal + [174960] = true, -- Veteran + [174961] = true, -- Hardmode +} RaidNotifier.BuffsDebuffs[RAID_DREADSAIL_REEF] = dreadsail_reef diff --git a/Settings.lua b/Settings.lua index f45400a..612c5db 100644 --- a/Settings.lua +++ b/Settings.lua @@ -319,6 +319,7 @@ do ------------------ }, dreadsailReef = { imminent_debuffs = false, + taleria_rapid_deluge = 0, -- "Off" }, dbg = { enable = false, @@ -570,6 +571,7 @@ function RaidNotifier:CreateSettingsMenu() bahsei_embrace_of_death = off_self_all, }, dreadsailReef = { + taleria_rapid_deluge = off_self_all, }, } @@ -1721,6 +1723,12 @@ function RaidNotifier:CreateSettingsMenu() name = L.Settings_DreadsailReef_Imminent_Debuffs, tooltip = L.Settings_DreadsailReef_Imminent_Debuffs_TT, }, "dreadsailReef", "imminent_debuffs") + MakeControlEntry({ + type = "dropdown", + name = L.Settings_DreadsailReef_Rapid_Deluge, + tooltip = L.Settings_DreadsailReef_Rapid_Deluge_TT, + choices = choices.dreadsailReef.taleria_rapid_deluge, + }, "dreadsailReef", "taleria_rapid_deluge") subTable = nil --end submenu MakeControlEntry({ diff --git a/TrialDreadsailReef.lua b/TrialDreadsailReef.lua index e72d659..55d5a0d 100644 --- a/TrialDreadsailReef.lua +++ b/TrialDreadsailReef.lua @@ -39,6 +39,13 @@ function RaidNotifier.DSR.OnCombatEvent(_, result, isError, aName, aGraphic, aAc elseif (tName ~= "") then self:StartCountdown(hitValue, zo_strformat(GetString(RAIDNOTIFIER_ALERTS_DREADSAILREEF_IMMINENT_CHILL_OTHER), tName), "dreadsailReef", "imminent_debuffs", true) end + -- Tideborn Taleria's Rapid Deluge + elseif (buffsDebuffs.taleria_rapid_deluge[abilityId] and settings.taleria_rapid_deluge > 0) then + if (tType == COMBAT_UNIT_TYPE_PLAYER) then + self:StartCountdown(hitValue, GetString(RAIDNOTIFIER_ALERTS_DREADSAILREEF_RAPID_DELUGE), "dreadsailReef", "taleria_rapid_deluge", true) + elseif (settings.taleria_rapid_deluge == 2 and tName ~= "") then + self:StartCountdown(hitValue, zo_strformat(GetString(RAIDNOTIFIER_ALERTS_DREADSAILREEF_RAPID_DELUGE_OTHER), tName), "dreadsailReef", "taleria_rapid_deluge", true) + end end end end diff --git a/lang/en.lua b/lang/en.lua index 57db68e..85f5577 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -632,12 +632,16 @@ L.Settings_DreadsailReef_Header = "Dreadsail Reef" -- Settings L.Settings_DreadsailReef_Imminent_Debuffs = "Lylanar & Turlassil: Imminent Blister/Chill" 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_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." -- Alerts L.Alerts_DreadsailReef_Imminent_Blister = "You're afflicted by |cF27D0CImminent Blister|r! Swap tanks until" L.Alerts_DreadsailReef_Imminent_Blister_Other = "|cFF0000<>|r afflicted by |cF27D0CImminent Blister|r! Swap tanks until" L.Alerts_DreadsailReef_Imminent_Chill = "You're afflicted by |cB4CFFAImminent Chill|r! Swap tanks until" L.Alerts_DreadsailReef_Imminent_Chill_Other = "|cFF0000<>|r afflicted by |cB4CFFAImminent Chill|r! Swap tanks until" +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" --------------------------------