#ICC/Sindragosa: Changed icon setting method for beacons to not use a timer at all, instead use a count. once you have enough targets set them immediately. No scheduling timers used (to prevent it being schedule 2 or 5 or 6 times then bugging out in super rare cases if the unschedule method doesn't actually stop the extra runs.
#Party/Halls of Reflection: Fixed a bug where it would say "boss incoming" for wave 6 after a wipe. (it remembers if falric is dead now so it doesn't announce wave 5 again since world states in this zone are funny.
#Party/Falric: Added timer/announce for Falric's fear
#Party/Falric: Added timer/announce for Falric's fear
#Party/Ymiron: Added missing spellid for heroic bane, added bane timer, added warning/timer for his stun as well.
@@ -140,9 +140,11 @@
if phase == 1 and self.Options.SetIconOnFrostBeacon then
table.insert(beaconIconTargets, DBM:GetRaidUnitId(args.destName))
self:UnscheduleMethod("SetBeaconIcons")
- self:ScheduleMethod(0.1, "SetBeaconIcons")
+ if (mod:IsDifficulty("normal25") and #beaconIconTargets >= 5) or (mod:IsDifficulty("heroic25") and #beaconIconTargets >= 6) or ((mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10")) and #beaconIconTargets >= 2) then
+ self:SetBeaconIcons()--Sort and fire as early as possible once we have all targets.
end
- if phase == 2 then
+ end
+ if phase == 2 then--Phase 2 there is only one icon/beacon, don't use sorting method if we don't have to.
timerNextBeacon:Start()
if self.Options.SetIconOnFrostBeacon then
self:SetIcon(args.destName, 8)
@@ -11,20 +11,25 @@
"SPELL_AURA_REMOVED"
)
+local warnFear = mod:NewSpellAnnounce(72452, 3)
local warnImpendingDespair = mod:NewTargetAnnounce(72426, 3)
local warnQuiveringStrike = mod:NewTargetAnnounce(72453, 3)
+local timerFear = mod:NewBuffActiveTimer(4, 72452)
local timerImpendingDespair = mod:NewTargetTimer(6, 72426)
local timerQuiveringStrike = mod:NewTargetTimer(5, 72453)
function mod:SPELL_AURA_APPLIED(args)
if args:IsSpellID(72422, 72453) then
- timerQuiveringStrike:Show(args.destName)
+ timerQuiveringStrike:Start(args.destName)
warnQuiveringStrike:Show(args.destName)
elseif args:IsSpellID(72426) then
- timerImpendingDespair:Show(args.destName)
+ timerImpendingDespair:Start(args.destName)
warnImpendingDespair:Show(args.destName)
+ elseif args:IsSpellID(72452, 72435) then
+ warnFear:Show()
+ timerFear:Start()
end
end
@@ -2,18 +2,6 @@
local L = mod:GetLocalizedStrings()
mod:SetRevision(("$Revision: 2153 $"):sub(12, -3))
---mod:SetCreatureID(37226, 36954)--Both creature Ids used in Halls of Reflection
-
---[[if UnitFactionGroup("player") == "Alliance" then
- mod:RegisterCombat("yell", L.ACombatStart)
-else
- mod:RegisterCombat("yell", L.HCombatStart)
-end
-
-mod:RegisterKill("yell", L.YellCombatEnd)--Combat does not end for another 8 or so seconds after this yell (for achievement credit). Not sure how to go about fixing this yet.
-
-mod:SetMinCombatTime(120)--Dirty Hack to engage mod after a wipe on zonein and keep it engaged. if you wipe, pull yell happens as soon as you zone back in despite the event not actually being started until you tell jaina/sylvanas you're ready to try again. This is only way to hack around this so mod doesn't wipe you for not being in combat after yell.
---]]
mod:RegisterEvents(
"SPELL_AURA_REMOVED",
"CHAT_MSG_MONSTER_YELL"
@@ -20,6 +20,7 @@
mod:RemoveOption("HealthFrame")
local lastWave = 0
+local FalricDead = false
function mod:UPDATE_WORLD_STATES(args)
local text = select(3, GetWorldStateUIInfo(1))
@@ -36,9 +37,12 @@
if wave > lastWave then
warnNewWaveSoon:Cancel()
timerNextWave:Cancel()
- if wave == 5 or wave == 10 then
+ if (wave == 5 and not FalricDead) or wave == 10 then
warnNewWave:Show("Boss")
elseif wave > 0 then
+ if wave < 5 then
+ FalricDead = false
+ end
if self.Options.ShowAllWaveWarnings then
warnNewWave:Show("Wave")
end
@@ -58,5 +62,6 @@
if args.sourceName == L.Falric then
timerNextWave:Start(60)
warnNewWaveSoon:Schedule(50)
+ FalricDead = true
end
end
\ No newline at end of file
@@ -53,7 +53,7 @@
do
local lasttoxic = 0
function mod:SPELL_PERIODIC_DAMAGE(args)
- if args:IsSpellID(69024, 70436) and args:IsPlayer() and time() - lasttoxic > 2 then -- Toxic Waste, MOVE!
+ if args:IsSpellID(69024, 70436) and args:IsPlayer() and time() - lasttoxic > 2 then
specWarnToxic:Show()
lasttoxic = time()
end
@@ -12,9 +12,17 @@
)
local warningBane = mod:NewSpellAnnounce(48294, 3)
+local warningScreams = mod:NewSpellAnnounce(51750, 2)
+local timerBane = mod:NewBuffActiveTimer(5, 48294)
+local timerScreams = mod:NewBuffActiveTimer(8, 51750)
+
function mod:APELL_AURA_APPLIED(args)
- if args:IsSpellID(48294) then
+ if args:IsSpellID(48294, 59301) then
warningBane:Show()
+ timerBane:Start()
+ elseif args:IsSpellID(51750) then
+ warningScreams:Show()
+ timerScreams:Start()
end
end
\ No newline at end of file