BfA/Freehold/Kragg: Spawn Parrot event updates for 10.1.7 and 10.2

BigWigsMods · Oct 1, 2023 · a78ff9f · a78ff9f
1 parent 5b238a1
commit a78ff9f
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/BfA/Freehold/Kragg.lua b/BfA/Freehold/Kragg.lua
@@ -31,8 +31,8 @@ end
 
 function mod:OnBossEnable()
 	-- Stages
-	-- 10.1.7: Encounter Event no longer logs and Spawn Parrot is still hidden
-	self:RegisterUnitEvent("UNIT_SPELLCAST_SUCCEEDED", nil, "boss1") -- Spawn Parrot
+	self:Log("SPELL_AURA_APPLIED", "EncounterEvent", 181089) -- XXX pre-10.2 Spawn Parrot compat
+	self:Log("SPELL_CAST_SUCCESS", "SpawnParrot", 256056)
 
 	-- Stage 1: Mounted Assault
 	self:Log("SPELL_CAST_START", "Charrrrrge", 255952)
@@ -57,17 +57,21 @@ end
 
 -- Stages
 
-function mod:UNIT_SPELLCAST_SUCCEEDED(event, unit, _, spellId)
-	if spellId == 256056 then -- Spawn Parrot
-		self:StopBar(255952) -- Charrrrrge
-		self:Message(spellId, "cyan", CL.percent:format(75, self:SpellName(spellId)))
-		self:PlaySound(spellId, "long")
-		self:CDBar(256005, 2.4) -- Vile Bombardment
-		self:CDBar(256106, 5.3) -- Azerite Powder Shot
-		if not self:Normal() then
-			self:CDBar(272046, 14.0) -- Dive Bomb
-		end
-		self:UnregisterUnitEvent(event, unit)
+function mod:EncounterEvent() -- XXX pre-10.2 Spawn Parrot compat
+	self:SpawnParrot({
+		spellId = 256056,
+		spellName = self:SpellName(256056),
+	})
+end
+
+function mod:SpawnParrot(args)
+	self:Message(args.spellId, "cyan", CL.percent:format(75, args.spellName))
+	self:PlaySound(args.spellId, "long")
+	self:StopBar(255952) -- Charrrrrge
+	self:CDBar(256005, 2.4) -- Vile Bombardment
+	self:CDBar(256106, 5.3) -- Azerite Powder Shot
+	if not self:Normal() then
+		self:CDBar(272046, 14.0) -- Dive Bomb
 	end
 end