[DSR] Reworked configuration for Ice/Fire Dome alerts

kyoma · Oct 1, 2023 · 0d6c8c8 · 0d6c8c8
1 parent aaf8cba
commit 0d6c8c8
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/Settings.lua b/Settings.lua
@@ -319,6 +319,7 @@ do ------------------
 			bahsei_embrace_of_death = 0, -- "Off"
 		},
 		dreadsailReef = {
+			dome_type = 3, -- "All"
 			dome_activation = false,
 			dome_stack_alert = 0, -- "Off"
 			dome_stack_threshold = 15,
@@ -578,12 +579,18 @@ function RaidNotifier:CreateSettingsMenu()
 			bahsei_embrace_of_death = off_self_all,
 		},
 		dreadsailReef = {
-			dome_stack_alert = {
+			dome_type = {
 				L.Settings_General_Choices_Off,
 				L.Settings_DreadsailReef_Choices_OnlyFireDome,
 				L.Settings_DreadsailReef_Choices_OnlyIceDome,
 				L.Settings_General_Choices_All,
 			},
+			dome_stack_alert = {
+				L.Settings_General_Choices_Off,
+				L.Settings_General_Choices_Self,
+				L.Settings_General_Choices_Others,
+				L.Settings_General_Choices_All,
+			},
 			brothers_heavy_attack = off_self_all,
 			taleria_rapid_deluge = off_self_all,
 		},
@@ -1737,16 +1744,29 @@ function RaidNotifier:CreateSettingsMenu()
 
 	-- Dreadsail Reef
 	MakeSubmenu(L.Settings_DreadsailReef_Header, RaidNotifier:GetRaidDescription(RAID_DREADSAIL_REEF))
+	MakeControlEntry({
+		type = "dropdown",
+		name = L.Settings_DreadsailReef_Dome_Type,
+		tooltip = L.Settings_DreadsailReef_Dome_Type_TT,
+		choices = choices.dreadsailReef.dome_type,
+		noAlert = true,
+	}, "dreadsailReef", "dome_type")
 	MakeControlEntry({
 		type = "checkbox",
 		name = L.Settings_DreadsailReef_Dome_Activation,
 		tooltip = L.Settings_DreadsailReef_Dome_Activation_TT,
+		disabled = function()
+			return savedVars.dreadsailReef.dome_type == 0;
+		end,
 	}, "dreadsailReef", "dome_activation")
 	MakeControlEntry({
 		type = "dropdown",
 		name = L.Settings_DreadsailReef_Dome_Stack_Alert,
 		tooltip = L.Settings_DreadsailReef_Dome_Stack_Alert_TT,
 		choices = choices.dreadsailReef.dome_stack_alert,
+		disabled = function()
+			return savedVars.dreadsailReef.dome_type == 0;
+		end,
 	}, "dreadsailReef", "dome_stack_alert")
 	MakeControlEntry({
 		type = "slider",
@@ -1756,7 +1776,7 @@ function RaidNotifier:CreateSettingsMenu()
 		max = 25,
 		step = 1,
 		disabled = function()
-			return savedVars.dreadsailReef.dome_stack_alert == 0;
+			return savedVars.dreadsailReef.dome_type == 0 or savedVars.dreadsailReef.dome_stack_alert == 0;
 		end,
 		noAlert = true,
 	}, "dreadsailReef", "dome_stack_threshold")

diff --git a/TrialDreadsailReef.lua b/TrialDreadsailReef.lua
@@ -25,14 +25,22 @@ function RaidNotifier.DSR.OnEffectChanged(eventCode, changeType, eSlot, eName, u
 
     -- Player receiving stacks while holding Fire/Ice Dome at the Lylanar&Turlassil encounter
     if ((abilityId == buffsDebuffs.destructive_ember_stack or abilityId == buffsDebuffs.piercing_hailstone_stack) and string.sub(uTag, 1, 5) == "group") then
-        local shouldNotify = (abilityId == buffsDebuffs.destructive_ember_stack and settings.dome_stack_alert == 1)
-            or (abilityId == buffsDebuffs.piercing_hailstone_stack and settings.dome_stack_alert == 2)
-            or settings.dome_stack_alert == 3
+        local shouldNotify = (abilityId == buffsDebuffs.destructive_ember_stack and settings.dome_type == 1)
+            or (abilityId == buffsDebuffs.piercing_hailstone_stack and settings.dome_type == 2)
+            or settings.dome_type == 3
+
+        local isPlayer = AreUnitsEqual(uTag, "player")
+
+        shouldNotify = shouldNotify and (
+            settings.dome_stack_alert == 1 and isPlayer
+                or settings.dome_stack_alert == 2 and not isPlayer
+                or settings.dome_stack_alert == 3
+        )
 
         if (shouldNotify and changeType ~= EFFECT_RESULT_FADED and stackCount == settings.dome_stack_threshold) then
             local text
 
-            if (AreUnitsEqual(uTag, "player")) then
+            if (isPlayer) then
                 if (abilityId == buffsDebuffs.destructive_ember_stack) then
                     text = zo_strformat(GetString(RAIDNOTIFIER_ALERTS_DREADSAILREEF_FIRE_DOME_STACK_ALERT), stackCount)
                 else

diff --git a/lang/en.lua b/lang/en.lua
@@ -36,6 +36,7 @@ L.Settings_General_Choices_Near                     = "Near"
 L.Settings_General_Choices_All                      = "All"
 L.Settings_General_Choices_Always                   = "Always"
 L.Settings_General_Choices_Other                    = "Other"
+L.Settings_General_Choices_Others                   = "Others"
 L.Settings_General_Choices_Inverted                 = "Inverted"
 L.Settings_General_Choices_Small_Announcement       = "Small (static, obsolete)"
 L.Settings_General_Choices_Large_Announcement       = "Large (static, obsolete)"
@@ -635,6 +636,8 @@ L.Alerts_Rockgrove_Embrace_Of_Death_Other          = "|cFF0000<<!aC:1>>|r cursed
 --------------------------------
 L.Settings_DreadsailReef_Header                    = "Dreadsail Reef"
 -- Settings
+L.Settings_DreadsailReef_Dome_Type                 = "Lylanar & Turlassil: Fire/Ice Dome filter"
+L.Settings_DreadsailReef_Dome_Type_TT              = "You can restrict notifications to some specific Dome."
 L.Settings_DreadsailReef_Dome_Activation           = "Lylanar & Turlassil: Fire/Ice Dome activation"
 L.Settings_DreadsailReef_Dome_Activation_TT        = "Alerts you when someone gets Fire or Ice Dome."
 L.Settings_DreadsailReef_Dome_Stack_Alert          = "Lylanar & Turlassil: Fire/Ice Dome stacks alert"