From 7f4c1d2e3f1d572f2dbeacb59af26948b34c6de6 Mon Sep 17 00:00:00 2001
From: Arrvis the Lion <dracoignitus@gmail.com>
Date: Sat, 6 Nov 2021 15:48:26 +0300
Subject: [PATCH] Revert "[RG] Added Sul-Xan's Soul Extraction announcement"

This reverts commit 1ca288f1171f20d294183549ccb80d902d9c710a.

This announcement does not work as expected. Decided to remove it.
---
 BuffsDebuffs.lua   |  5 -----
 Settings.lua       |  6 ------
 TrialRockgrove.lua | 12 ------------
 lang/en.lua        |  3 ---
 4 files changed, 26 deletions(-)

diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua
index 13cbbd5..3577187 100644
--- a/BuffsDebuffs.lua
+++ b/BuffsDebuffs.lua
@@ -617,11 +617,6 @@ rockgrove.sulxan_soulweaver_astral_shield_cast = 149089
 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
--- Sul-Xan Soulweaver's Soul Extraction
-rockgrove.sulxan_soulweaver_soul_extraction = {
-	[158441] = true,
-	[158442] = true,
-}
 -- Havocrel Barbarian's Hasted Assault
 rockgrove.havocrel_barbarian_hasted_assault = {
 	[149261] = true,
diff --git a/Settings.lua b/Settings.lua
index d30da8e..f898921 100644
--- a/Settings.lua
+++ b/Settings.lua
@@ -307,7 +307,6 @@ do ------------------
 		rockgrove = {
 			sulxan_reaver_sundering_strike = 0, -- "Off"
 			sulxan_soulweaver_astral_shield = false,
-			sulxan_soulweaver_soul_extraction = false,
 			prime_meteor = false,
 			havocrel_barbarian_hasted_assault = false,
 			oaxiltso_savage_blitz = false,
@@ -1657,11 +1656,6 @@ function RaidNotifier:CreateSettingsMenu()
 		name = L.Settings_Rockgrove_Astral_Shield,
 		tooltip = L.Settings_Rockgrove_Astral_Shield_TT,
 	}, "rockgrove", "sulxan_soulweaver_astral_shield")
-	MakeControlEntry({
-		type = "checkbox",
-		name = L.Settings_Rockgrove_Soul_Extraction,
-		tooltip = L.Settings_Rockgrove_Soul_Extraction_TT,
-	}, "rockgrove", "sulxan_soulweaver_soul_extraction")
 	MakeControlEntry({
 		type = "checkbox",
 		name = L.Settings_Rockgrove_Prime_Meteor,
diff --git a/TrialRockgrove.lua b/TrialRockgrove.lua
index 67943a6..7a58e22 100644
--- a/TrialRockgrove.lua
+++ b/TrialRockgrove.lua
@@ -77,11 +77,6 @@ function RaidNotifier.RG.OnCombatEvent(_, result, isError, aName, aGraphic, aAct
             if (settings.sulxan_soulweaver_astral_shield) then
                 self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_ASTRAL_SHIELD_CAST), "rockgrove", "sulxan_soulweaver_astral_shield")
             end
-        -- Sul-Xan Soulweaver's Soul Extraction
-        elseif (buffsDebuffs.sulxan_soulweaver_soul_extraction[abilityId]) then
-            if (settings.sulxan_soulweaver_soul_extraction and tType == COMBAT_UNIT_TYPE_PLAYER) then
-                self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_SOUL_EXTRACTION), "rockgrove", "sulxan_soulweaver_soul_extraction")
-            end
         -- Havocrel Barbarian's Hasted Assault
         elseif (buffsDebuffs.havocrel_barbarian_hasted_assault[abilityId]) then
             if (settings.havocrel_barbarian_hasted_assault) then
@@ -93,13 +88,6 @@ function RaidNotifier.RG.OnCombatEvent(_, result, isError, aName, aGraphic, aAct
                 self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_SAVAGE_BLITZ), tName), "rockgrove", "oaxiltso_savage_blitz")
             end
         end
-    elseif (result == ACTION_RESULT_EFFECT_GAINED_DURATION) then
-        -- Sul-Xan Soulweaver's Soul Extraction (Debug purpose only!)
-        if (buffsDebuffs.sulxan_soulweaver_soul_extraction[abilityId]) then
-            if (settings.sulxan_soulweaver_soul_extraction and tType == COMBAT_UNIT_TYPE_PLAYER) then
-                self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_ROCKGROVE_SOUL_EXTRACTION) .. " (GainDur)", "rockgrove", "sulxan_soulweaver_soul_extraction")
-            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 8661fdf..f70900b 100644
--- a/lang/en.lua
+++ b/lang/en.lua
@@ -590,8 +590,6 @@ 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."
-L.Settings_Rockgrove_Soul_Extraction               = "General: Soul Extraction"
-L.Settings_Rockgrove_Soul_Extraction_TT            = "Alerts you when the Sul-Xan Soulweaver casts Soul Extraction on you."
 L.Settings_Rockgrove_Prime_Meteor                  = "General: Prime Meteor"
 L.Settings_Rockgrove_Prime_Meteor_TT               = "Shows countdown when meteor appears indicating the time before it explodes. Make sure to kill the meteor in time."
 L.Settings_Rockgrove_Hasted_Assault                = "General: Hasted Assault"
@@ -609,7 +607,6 @@ L.Alerts_Rockgrove_Sundering_Strike_Other          = "Incoming |cCDCDCDSundering
 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!"
-L.Alerts_Rockgrove_Soul_Extraction                 = "Incoming Soul Extraction on you!"
 L.Alerts_Rockgrove_Prime_Meteor                    = "|cFFD600Prime Meteor|r will explode in"
 L.Alerts_Rockgrove_Hasted_Assault                  = "Incoming |cFF0000Hasted Assault|r! Block!"
 L.Alerts_Rockgrove_Savage_Blitz                    = "Oaxiltso charges at |cFF0000<<!aC:1>>|r!"