From 31ae4248108e9e4d74a619ab3e7493eb7b31e84c Mon Sep 17 00:00:00 2001
From: MysticalOS <mysticalosx@gmail.com>
Date: Sat, 9 Dec 2023 00:34:51 -0500
Subject: [PATCH] Rework staging on Lorgus Jett now that the add mechanics are
 figured out. also added an adds remaining alert for it

---
 .../VanillaSoD_BFD/LorgusJett.lua             | 29 +++++++++++++++++--
 DBM-Raids-Vanilla/localization.en.lua         |  8 +++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/DBM-Raids-Vanilla/VanillaSoD_BFD/LorgusJett.lua b/DBM-Raids-Vanilla/VanillaSoD_BFD/LorgusJett.lua
index 6797b932..49703d68 100644
--- a/DBM-Raids-Vanilla/VanillaSoD_BFD/LorgusJett.lua
+++ b/DBM-Raids-Vanilla/VanillaSoD_BFD/LorgusJett.lua
@@ -19,13 +19,16 @@ mod:RegisterEventsInCombat(
 )
 
 --[[
+ (ability.id = 419649 or ability.id = 414691 or ability.id = 414763 or ability.id = 419636) and type = "cast"
+ or (target.id = 207367 or target.id = 207358 or target.id = 214603 or target.id = 207359) and type = "death"
  or (source.type = "NPC" and source.firstSeen = timestamp) or (target.type = "NPC" and target.firstSeen = timestamp)
 --]]
 --TODO, more stage 1 add stuff, maybe more spawn timers?
 --TODO, Triple Puncture stacks 407794?
 --TODO, find a way to detect stage 2 start in cleaner better way
 --NOTE, New Totem every 9.5 seconds. Windfury 414691 -- > Lighting Shield 414763 -- > Molten Fury 419636 -- > repeat.
---local warnSleep					= mod:NewTargetNoFilterAnnounce(8399, 2)
+local warnPriestRemaining			= mod:NewAnnounce("warnPriestRemaining", 2)
+local warnPhase2					= mod:NewPhaseAnnounce(2, 2)
 local warnBlackfathomMurloc			= mod:NewSpellAnnounce(419649, 2)
 local warnWindfuryTotem				= mod:NewSpellAnnounce(414691, 2)
 local warnMoltenFuryTotem			= mod:NewSpellAnnounce(419636, 2)
@@ -45,8 +48,10 @@ mod:AddSetIconOption("SetIconOnAdds", 419649, true, 5, {1, 2})
 mod:AddSetIconOption("SetIconOnTotem", 414763, true, 5, {8})
 
 mod.vb.iconCount = 1
+mod.vb.priestessRemaining = 3
 
 function mod:OnCombatStart(delay)
+	self.vb.priestessRemaining = 3
 	timerBlackfathomMurlocCD:Start(27.5-delay)
 	self:SetStage(1)
 end
@@ -69,7 +74,7 @@ function mod:SPELL_CAST_SUCCESS(args)
 		warnBlackfathomMurloc:Show()
 		timerBlackfathomMurlocCD:Start()
 	elseif args:IsSpell(414691) then--Windfury totem
-		if self:GetStage(1) then
+		if self:GetStage(1) then--Shouldn't be needed, but i'll leave it
 			self:SetStage(2)
 			timerBlackfathomMurlocCD:Stop()
 		end
@@ -108,11 +113,31 @@ end
 --	end
 --end
 
+--"<8.52 23:15:31> [ENCOUNTER_START] 2710#Lorgus Jett#198#10", -- [62]
+--"<55.83 23:16:19> [CLEU] UNIT_DIED##nil#Creature-0-5164-48-15397-207358-00006C001D#Blackfathom Tide Priestess#-1#false#nil#nil", -- [1456]
+--"<76.80 23:16:39> [CLEU] UNIT_DIED##nil#Creature-0-5164-48-15397-207359-00006C001D#Blackfathom Tide Priestess#-1#false#nil#nil", -- [1974]
+--"<98.10 23:17:01> [CLEU] UNIT_DIED##nil#Creature-0-5164-48-15397-207367-00006C001D#Blackfathom Tide Priestess#-1#false#nil#nil", -- [2510]
+--"<104.41 23:17:07> [CLEU] SPELL_CAST_SUCCESS#Creature-0-5164-48-15397-207356-00006C001D#Lorgus Jett##nil#414691#Corrupted Windfury Totem#nil#nil", -- [2676]
 function mod:UNIT_DIED(args)
 	local cid = self:GetCIDFromGUID(args.destGUID)
 	if cid == 204645 or cid == 204091 or cid == 209209 then--Blackfathom Elites
 		timerTriplePunctureCD:Stop(args.destGUID)
 	elseif cid == 207367 or cid == 207358 or cid == 214603 or cid == 207359 then--Blackfathom Tide Priestess
 		timerHealCD:Stop(args.destGUID)
+		--Boss versions, 214603 is trash version thats included only if non boss version is pulled and we want to stop a heal timer
+		if cid == 207367 or cid == 207358 or cid == 207359 then
+			self.vb.priestessRemaining = self.vb.priestessRemaining - 1
+			if self.vb.priestessRemaining > 0 then
+				warnPriestRemaining:Show(self.vb.priestessRemaining)
+			end
+			if cid == 207367 then--Last add dying
+				if self:GetStage(1) then
+					self:SetStage(2)
+					warnPhase2:Show()
+					timerBlackfathomMurlocCD:Stop()
+					timerWindfuryTotemCD:Start(6.3)
+				end
+			end
+		end
 	end
 end
diff --git a/DBM-Raids-Vanilla/localization.en.lua b/DBM-Raids-Vanilla/localization.en.lua
index 357ad9a8..ae32670f 100755
--- a/DBM-Raids-Vanilla/localization.en.lua
+++ b/DBM-Raids-Vanilla/localization.en.lua
@@ -1151,6 +1151,14 @@ L:SetGeneralLocalization({
 	name = "Lorgus Jett"
 })
 
+L:SetWarningLocalization({
+	warnPriestRemaining		= "%s Priestesses remaining"
+})
+
+L:SetOptionLocalization({
+	warnPriestRemaining	= "Show warning for how maining Blackfathom Tide Priestesses are remaining"
+})
+
 ------------------
 --  Twilight Lord Kelris  --
 ------------------