diff --git a/Delves/TheSpiralWeave/Options/Colors.lua b/Delves/TheSpiralWeave/Options/Colors.lua index 00360d4f3..356d6f1d1 100644 --- a/Delves/TheSpiralWeave/Options/Colors.lua +++ b/Delves/TheSpiralWeave/Options/Colors.lua @@ -11,5 +11,5 @@ BigWigs:AddColors("The Puppetmaster", { [450509] = "purple", [450546] = {"blue","green","red"}, [450714] = "orange", - [451913] = "orange", + [451913] = {"blue","orange"}, }) diff --git a/Delves/TheSpiralWeave/Options/Sounds.lua b/Delves/TheSpiralWeave/Options/Sounds.lua index 7f0a741b9..1a8b2b3e5 100644 --- a/Delves/TheSpiralWeave/Options/Sounds.lua +++ b/Delves/TheSpiralWeave/Options/Sounds.lua @@ -11,5 +11,5 @@ BigWigs:AddSounds("The Puppetmaster", { [450509] = "alarm", [450546] = "alert", [450714] = "alarm", - [451913] = "alarm", + [451913] = {"alarm","underyou"}, }) diff --git a/Delves/TheSpiralWeave/ThePuppetmaster.lua b/Delves/TheSpiralWeave/ThePuppetmaster.lua index 1659f8da4..32fbfe2bf 100644 --- a/Delves/TheSpiralWeave/ThePuppetmaster.lua +++ b/Delves/TheSpiralWeave/ThePuppetmaster.lua @@ -63,6 +63,8 @@ end function mod:OnBossEnable() -- The Puppetmaster? (First Stage) self:Log("SPELL_CAST_START", "GrimweaveOrb", 451913) + self:Log("SPELL_AURA_APPLIED", "GrimweaveOrbDamage", 452041) + self:Log("SPELL_AURA_REFRESH", "GrimweaveOrbDamage", 452041) self:Death("Stage1Death", 220507) -- The Puppetmaster? (Second Stage) @@ -106,6 +108,20 @@ do end end + do + local prev = 0 + function mod:GrimweaveOrbDamage(args) + -- this spellId can also be cast by trash + if self:MobId(args.sourceGUID) == 220507 then -- The Puppetmaster? + if self:Me(args.destGUID) and args.time - prev > 1.5 then + prev = args.time + self:PersonalMessage(451913, "near") + self:PlaySound(451913, "underyou") + end + end + end + end + function mod:Stage1Death() if timer then self:CancelTimer(timer)