From 0cd933ae7da134a638d16baf41331123814762eb Mon Sep 17 00:00:00 2001
From: Nick Towle <ntowle@gmail.com>
Date: Sat, 30 Sep 2023 16:38:02 -0400
Subject: [PATCH] WoD/TheEverbloom/ArchmageSol: Cinderbolt Storm, Glacial
 Fusion, Spatial Compression

---
 WoD/TheEverbloom/ArchmageSol.lua    | 138 ++++++++++++++++++++++------
 WoD/TheEverbloom/Options/Colors.lua |   3 +
 WoD/TheEverbloom/Options/Sounds.lua |   3 +
 3 files changed, 114 insertions(+), 30 deletions(-)

diff --git a/WoD/TheEverbloom/ArchmageSol.lua b/WoD/TheEverbloom/ArchmageSol.lua
index d3bcc1647..2d8860c24 100644
--- a/WoD/TheEverbloom/ArchmageSol.lua
+++ b/WoD/TheEverbloom/ArchmageSol.lua
@@ -1,13 +1,13 @@
-
+local isTenDotTwo = select(4, GetBuildInfo()) >= 100200 --- XXX delete when 10.2 is live everywhere
 --------------------------------------------------------------------------------
 -- Module Declaration
 --
 
 local mod, CL = BigWigs:NewBoss("Archmage Sol", 1279, 1208)
 if not mod then return end
-mod:RegisterEnableMob(82682)
-mod.engageId = 1751
-mod.respawnTime = 15
+mod:RegisterEnableMob(82682) -- Archmage Sol
+mod:SetEncounterID(1751)
+mod:SetRespawnTime(30)
 
 --------------------------------------------------------------------------------
 -- Initialization
@@ -15,52 +15,130 @@ mod.respawnTime = 15
 
 function mod:GetOptions()
 	return {
-		168885, -- Parasitic Growth
-		{166492, "FLASH"}, -- Firebloom
-		166726, -- Frozen Rain
-		"stages",
+		427899, -- Cinderbolt Storm
+		428082, -- Glacial Fusion
+		428139, -- Spatial Compression
+		-- XXX delete these option keys below when 10.2 is live everywhere
+		not isTenDotTwo and "stages" or nil,
+		not isTenDotTwo and 168885 or nil, -- Parasitic Growth
+		not isTenDotTwo and {166492, "FLASH"} or nil, -- Firebloom
+		not isTenDotTwo and 166726 or nil, -- Frozen Rain
 	}
 end
 
 function mod:OnBossEnable()
-	self:Log("SPELL_CAST_START", "ParasiticGrowth", 168885)
-	self:Log("SPELL_AURA_APPLIED", "MagicSchools", 166475, 166476, 166477) -- Fire, Frost, Arcane
-	self:Log("SPELL_AURA_APPLIED", "FrozenRain", 166726)
-	self:Log("SPELL_CAST_SUCCESS", "Firebloom", 166492)
+	-- XXX bring these listeners outside the if block when 10.2 is live everywhere
+    if isTenDotTwo then
+		self:Log("SPELL_AURA_APPLIED", "CinderboltStorm", 427899)
+		self:Log("SPELL_AURA_APPLIED", "GlacialFusion", 428082)
+		self:Log("SPELL_CAST_START", "SpatialCompression", 428139)
+	else
+		-- XXX delete these listeners below when 10.2 is live everywhere
+		self:Log("SPELL_CAST_START", "ParasiticGrowth", 168885)
+		self:Log("SPELL_AURA_APPLIED", "MagicSchools", 166475, 166476, 166477) -- Fire, Frost, Arcane
+		self:Log("SPELL_AURA_APPLIED", "FrozenRain", 166726)
+		self:Log("SPELL_CAST_SUCCESS", "Firebloom", 166492)
+	end
 end
 
 function mod:OnEngage()
-	self:MessageOld("stages", "cyan", nil, 166475) -- Fire
-	self:CDBar(168885, 33) -- Parasitic Growth
+	self:CDBar(427899, 3.3) -- Cinderbolt Storm
+	self:CDBar(428082, 24.2) -- Glacial Fusion
+	self:CDBar(428139, 43.3) -- Spatial Compression
+end
+
+-- XXX delete this entire block below when 10.2 is live everywhere
+if not isTenDotTwo then
+	-- before 10.2
+	function mod:GetOptions()
+		return {
+			"stages",
+			168885, -- Parasitic Growth
+			{166492, "FLASH"}, -- Firebloom
+			166726, -- Frozen Rain
+		}
+	end
+	function mod:OnEngage()
+		self:MessageOld("stages", "cyan", nil, 166475) -- Fire
+		self:CDBar(168885, 33) -- Parasitic Growth
+	end
 end
 
 --------------------------------------------------------------------------------
 -- Event Handlers
 --
 
-function mod:ParasiticGrowth(args)
-	self:MessageOld(args.spellId, "orange", "warning")
-	self:Bar(args.spellId, 34)
+function mod:CinderboltStorm(args)
+	self:Message(args.spellId, "red")
+	self:PlaySound(args.spellId, "long")
+	if self:Mythic() then
+		if self:MobId(args.sourceGUID) == 82682 then -- Archmage Sol
+			self:CDBar(args.spellId, 20.5)
+			self:CDBar(428082, 20.5) -- Glacial Fusion
+		else -- 213689, Spore Image
+			self:CDBar(args.spellId, 39.0)
+		end
+	else
+		self:CDBar(args.spellId, 59.5)
+	end
 end
 
-function mod:MagicSchools(args)
-	self:MessageOld("stages", "cyan", nil, args.spellId)
+function mod:GlacialFusion(args)
+	self:Message(args.spellId, "orange")
+	self:PlaySound(args.spellId, "alarm")
+	if self:Mythic() then
+		if self:MobId(args.sourceGUID) == 82682 then -- Archmage Sol
+			self:CDBar(args.spellId, 20.5)
+			self:CDBar(428139, 20.5) -- Spatial Compression
+		else -- 213689, Spore Image
+			self:CDBar(args.spellId, 39.0)
+		end
+	else
+		self:CDBar(args.spellId, 59.5)
+	end
 end
 
-do
-	local prev = 0
-	function mod:Firebloom(args)
-		local t = GetTime()
-		if t-prev > 7 then
-			prev = t
-			self:MessageOld(args.spellId, "red", "alert")
-			self:Flash(args.spellId)
+function mod:SpatialCompression(args)
+	self:Message(args.spellId, "yellow")
+	self:PlaySound(args.spellId, "info")
+	if self:Mythic() then
+		if self:MobId(args.sourceGUID) == 82682 then -- Archmage Sol
+			self:CDBar(args.spellId, 20.5)
+			self:CDBar(427899, 20.5) -- Cinderbolt Storm
+		else -- 213689, Spore Image
+			self:CDBar(args.spellId, 39.0)
 		end
+	else
+		self:CDBar(args.spellId, 59.5)
 	end
 end
 
-function mod:FrozenRain(args)
-	if self:Me(args.destGUID) then
-		self:MessageOld(args.spellId, "blue", "alarm", CL.you:format(args.spellName))
+-- XXX delete this entire block below when 10.2 is live everywhere
+if not isTenDotTwo then
+	function mod:ParasiticGrowth(args)
+		self:MessageOld(args.spellId, "orange", "warning")
+		self:Bar(args.spellId, 34)
+	end
+
+	function mod:MagicSchools(args)
+		self:MessageOld("stages", "cyan", nil, args.spellId)
+	end
+
+	do
+		local prev = 0
+		function mod:Firebloom(args)
+			local t = GetTime()
+			if t-prev > 7 then
+				prev = t
+				self:MessageOld(args.spellId, "red", "alert")
+				self:Flash(args.spellId)
+			end
+		end
+	end
+
+	function mod:FrozenRain(args)
+		if self:Me(args.destGUID) then
+			self:MessageOld(args.spellId, "blue", "alarm", CL.you:format(args.spellName))
+		end
 	end
 end
diff --git a/WoD/TheEverbloom/Options/Colors.lua b/WoD/TheEverbloom/Options/Colors.lua
index e33c6877f..8ca2bb861 100644
--- a/WoD/TheEverbloom/Options/Colors.lua
+++ b/WoD/TheEverbloom/Options/Colors.lua
@@ -31,6 +31,9 @@ BigWigs:AddColors("Archmage Sol", {
 	[166492] = "red",
 	[166726] = "blue",
 	[168885] = "orange",
+	[427899] = "red",
+	[428082] = "orange",
+	[428139] = "yellow",
 	["stages"] = "cyan",
 })
 
diff --git a/WoD/TheEverbloom/Options/Sounds.lua b/WoD/TheEverbloom/Options/Sounds.lua
index 06fc1ef6c..94de2e74a 100644
--- a/WoD/TheEverbloom/Options/Sounds.lua
+++ b/WoD/TheEverbloom/Options/Sounds.lua
@@ -29,6 +29,9 @@ BigWigs:AddSounds("Archmage Sol", {
 	[166492] = "alert",
 	[166726] = "alarm",
 	[168885] = "warning",
+	[427899] = "long",
+	[428082] = "alarm",
+	[428139] = "info",
 })
 
 BigWigs:AddSounds("Yalnu", {