From e936810e00842f8d6c9d52f3d320ae87bcd8ea40 Mon Sep 17 00:00:00 2001
From: Arrvis the Lion <dracoignitus@gmail.com>
Date: Fri, 10 Sep 2021 19:08:44 +0300
Subject: [PATCH] [RG] Added Sul-Xan's Astral Shield announcement

---
 BuffsDebuffs.lua   |  6 ++++++
 Settings.lua       |  6 ++++++
 TrialRockgrove.lua | 17 +++++++++++++++++
 lang/en.lua        |  5 +++++
 4 files changed, 34 insertions(+)

diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua
index 70f3a82..b7ed98b 100644
--- a/BuffsDebuffs.lua
+++ b/BuffsDebuffs.lua
@@ -607,5 +607,11 @@ local rockgrove = {}
 
 -- Sul-Xan Reaver's Sundering Strike
 rockgrove.sulxan_reaver_sundering_strike = 149524
+-- Sul-Xan Soulweaver's Astral Shield: casting
+rockgrove.sulxan_soulweaver_astral_shield_cast = 149089
+-- Sul-Xan Soulweaver's Astral Shield: gained shield by himself
+rockgrove.sulxan_soulweaver_astral_shield_self = 149099
+-- Sul-Xan Soulweaver's Astral Shield: gained shield by other adds
+rockgrove.sulxan_soulweaver_astral_shield_others = 157236
 
 RaidNotifier.BuffsDebuffs[RAID_ROCKGROVE] = rockgrove
diff --git a/Settings.lua b/Settings.lua
index 039ca61..3476b9f 100644
--- a/Settings.lua
+++ b/Settings.lua
@@ -303,6 +303,7 @@ do ------------------
 		},
 		rockgrove = {
 			sulxan_reaver_sundering_strike = 0, -- "Off"
+			sulxan_soulweaver_astral_shield = false,
 		},
 		dbg = {
 			enable = false,
@@ -1616,6 +1617,11 @@ function RaidNotifier:CreateSettingsMenu()
 		tooltip = L.Settings_Rockgrove_Sundering_Strike_TT,
 		choices = choices.rockgrove.sulxan_reaver_sundering_strike,
 	}, "rockgrove", "sulxan_reaver_sundering_strike")
+	MakeControlEntry({
+		type = "checkbox",
+		name = L.Settings_Rockgrove_Astral_Shield,
+		tooltip = L.Settings_Rockgrove_Astral_Shield_TT,
+	}, "rockgrove", "sulxan_soulweaver_astral_shield")
 	subTable = nil --end submenu
 
 	MakeControlEntry({
diff --git a/TrialRockgrove.lua b/TrialRockgrove.lua
index 674f28d..dcf228b 100644
--- a/TrialRockgrove.lua
+++ b/TrialRockgrove.lua
@@ -32,6 +32,23 @@ function RaidNotifier.RG.OnCombatEvent(_, result, isError, aName, aGraphic, aAct
             elseif (settings.sulxan_reaver_sundering_strike == 2 and tName ~= "") then
                 self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_SUNDERING_STRIKE_OTHER), tName), "rockgrove", "sulxan_reaver_sundering_strike")
             end
+        -- Sul-Xan Soulweaver's Astral Shield (cast)
+        elseif (abilityId == buffsDebuffs.sulxan_soulweaver_astral_shield_cast) then
+            if (settings.sulxan_soulweaver_astral_shield) then
+                self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_ASTRAL_SHIELD_CAST), "rockgrove", "sulxan_soulweaver_astral_shield")
+            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
+            if (settings.sulxan_soulweaver_astral_shield) then
+                self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_SOUL_REMNANT_HEAVY), "rockgrove", "sulxan_soulweaver_astral_shield")
+            end
+        -- Other's Soul Remnant attack (Astral Shield gained from Soulweaver is broken)
+        elseif (abilityId == buffsDebuffs.sulxan_soulweaver_astral_shield_others) then
+            if (settings.sulxan_soulweaver_astral_shield) then
+                self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_SOUL_REMNANT), "rockgrove", "sulxan_soulweaver_astral_shield")
+            end
         end
     end
 end
diff --git a/lang/en.lua b/lang/en.lua
index 959e1a8..6fb798e 100644
--- a/lang/en.lua
+++ b/lang/en.lua
@@ -579,10 +579,15 @@ L.Settings_Rockgrove_Header                        = "Rockgrove"
 -- Settings
 L.Settings_Rockgrove_Sundering_Strike              = "General: Sundering Strike"
 L.Settings_Rockgrove_Sundering_Strike_TT           = "Alerts you when the Sul-Xan Reaper makes Sundering Strike attack. Roll dodge it."
+L.Settings_Rockgrove_Astral_Shield                 = "General: Astral Shield"
+L.Settings_Rockgrove_Astral_Shield_TT              = "Alerts you when the Sul-Xan Soulweaver casts his Astral Shield, and when Soul Remnants affect you."
 
 -- Alerts
 L.Alerts_Rockgrove_Sundering_Strike                = "Incoming |cCDCDCDSundering Strike|r on you!"
 L.Alerts_Rockgrove_Sundering_Strike_Other          = "Incoming |cCDCDCDSundering Strike|r on |cFF0000<<!aC:1>>|r!"
+L.Alerts_Rockgrove_Astral_Shield_Cast              = "|cFFFF8FAstral Shield|r has been casted. Prepare to dodge or block!"
+L.Alerts_Rockgrove_Soul_Remnant_Heavy              = "|cFF0000Incoming|r |c8FF2FFSoul Remnant|r!"
+L.Alerts_Rockgrove_Soul_Remnant                    = "Incoming |c8FF2FFSoul Remnant|r!"
 
 
 --------------------------------