diff --git a/Legion/EyeOfAzshara/LadyHatecoil.lua b/Legion/EyeOfAzshara/LadyHatecoil.lua index 958ade72e..7664340e8 100644 --- a/Legion/EyeOfAzshara/LadyHatecoil.lua +++ b/Legion/EyeOfAzshara/LadyHatecoil.lua @@ -50,6 +50,9 @@ function mod:OnEngage() self:CDBar(193597, 10) -- Static Nova self:CDBar(193611, 25) -- Focused Lightning self:CDBar("blob", 21, -12139, L.blob_icon) -- Saltsea Globule + if not self:Normal() then + self:CDBar(196610, 31) -- Monsoon + end end -------------------------------------------------------------------------------- @@ -87,8 +90,9 @@ function mod:BeckonStorm(args) end function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, _, _, spellId) - if spellId == 196634 then -- Monsoon + -- Starts by using 196629 then randomly swaps to using 196634 (mythic) + if spellId == 196634 or spellId == 196629 then -- Monsoon self:Message(196610, "Positive") - --self:CDBar(196610, 47) -- XXX + self:CDBar(196610, 20) end end diff --git a/Legion/EyeOfAzshara/WarlordParjesh.lua b/Legion/EyeOfAzshara/WarlordParjesh.lua index ae26bab0a..3566d485c 100644 --- a/Legion/EyeOfAzshara/WarlordParjesh.lua +++ b/Legion/EyeOfAzshara/WarlordParjesh.lua @@ -73,8 +73,7 @@ end do function mod:CallReinforcementsNormal(args) -- Normal only --["192073-Call Reinforcements"] = "pull:26.0, 52.3", - --["192072-Call Reinforcements"] = "pull:5.4, 52.3", - --XXX separate? + --["192072-Call Reinforcements"] = "pull:5.4, 52.3, 52.2", self:Message(192072, "Attention", "Info", args.spellName, args.spellId) self:CDBar(192072, addCount % 2 == 0 and 31 or 20, args.spellName, args.spellId == 192072 and 192073 or 192072) -- Use correct icon for upcoming add addCount = addCount + 1 diff --git a/Legion/EyeOfAzshara/WrathOfAzshara.lua b/Legion/EyeOfAzshara/WrathOfAzshara.lua index 956aad972..0895ff0da 100644 --- a/Legion/EyeOfAzshara/WrathOfAzshara.lua +++ b/Legion/EyeOfAzshara/WrathOfAzshara.lua @@ -56,7 +56,7 @@ end function mod:CHAT_MSG_RAID_BOSS_EMOTE(_, msg, _, _, _, unit) -- Arcane Bomb if msg:find("192708", nil, true) then -- Fires with _START, target scanning doesn't work. self:TargetMessage(192706, unit, "Important", "Alarm") - self:CDBar(192706, p2 and 23 or 30) -- pull:23.1, 30.4, 23.1 / hc pull:26.7, 31.2, 23.1 / pull:26.4, 30.4, 30.4, 36.5 XXX + self:CDBar(192706, p2 and 23 or 30) -- pull:23.1, 30.4, 23.1 / hc pull:39.7 / hc pull:26.7, 31.2, 23.1 / m pull:26.4, 30.4, 30.4, 36.5 XXX end end @@ -90,7 +90,7 @@ end function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, _, _, spellId) if spellId == 192680 then -- Mystic Tornado self:RangeMessage(192675, "Urgent", "Alert") - self:CDBar(192675, p2 and 15 or 25) -- XXX m pull:8.6, 25.1, 34.0, 18.2, 15.8, 20.7, 15.8 + self:CDBar(192675, p2 and 15 or 25) -- hc pull:8.5, 26.3, 15.8 / m pull:8.6, 25.1, 34.0, 18.2, 15.8, 20.7, 15.8 end end