#ICC/LichKing: Announce which valk set it is on lich king (drycoded-untested)
ICC/Festergut: use right spellid for festergut goo warning tooltip
@@ -33,7 +33,7 @@
local warnDefileSoon = mod:NewSoonAnnounce(73708, 3) --Phase 2+ Ability
local warnSoulreaper = mod:NewSpellAnnounce(73797, 4, nil, mod:IsTank() or mod:IsHealer()) --Phase 2+ Ability
local warnDefileCast = mod:NewTargetAnnounce(72762, 4) --Phase 2+ Ability
-local warnSummonValkyr = mod:NewSpellAnnounce(69037, 3) --Phase 2 Add
+local warnSummonValkyr = mod:NewAnnounce("WarningValkyrSpawned", 3, 69037) --Phase 2 Add
local warnPhase3Soon = mod:NewAnnounce("WarnPhase3Soon", 1)
local warnSummonVileSpirit = mod:NewSpellAnnounce(70498, 2) --Phase 3 Add
local warnHarvestSoul = mod:NewTargetAnnounce(74325, 4) --Phase 3 Ability
@@ -48,7 +48,7 @@
local specWarnWinter = mod:NewSpecialWarningMove(73791) --Transition Ability
local specWarnHarvestSoul = mod:NewSpecialWarningYou(74325) --Phase 3+ Ability
local specWarnInfest = mod:NewSpecialWarningSpell(73779, false) --Phase 1+ Ability
-local specwarnSoulreaper = mod:NewSpecialWarningTarget(73797, false) --phase 2+
+local specwarnSoulreaper = mod:NewSpecialWarningTarget(73797, mod:IsTank()) --phase 2+
local specWarnTrap = mod:NewSpecialWarningYou(73539) --Heroic Ability
local timerCombatStart = mod:NewTimer(54.5, "TimerCombatStart", 2457)
@@ -82,6 +82,7 @@
local warned_preP2 = false
local warned_preP3 = false
local lastPlagueCast = 0
+local Valkset = 0
function mod:OnCombatStart(delay)
berserkTimer:Start(-delay)
@@ -90,6 +91,7 @@
warned_preP3 = false
self:NextPhase()
lastPlagueCast = 0
+ Valkset = 0
end
function mod:DefileTarget()
@@ -232,7 +234,8 @@
function mod:SPELL_SUMMON(args)
if args:IsSpellID(69037) then -- Summon Val'kyr
if time() - lastValk > 15 then -- show the warning and timer just once for all three summon events
- warnSummonValkyr:Show()
+ Valkset = Valkset + 1
+ warnSummonValkyr:Show(Valkset)
timerSummonValkyr:Start()
lastValk = time()
if self.Options.ValkyrIcon then
@@ -301,7 +304,7 @@
timerSummonValkyr:Start(20)
timerSoulreaperCD:Start(40)
timerDefileCD:Start(38)
- timerInfestCD:Start(13)
+ timerInfestCD:Start(14)
warnDefileSoon:Schedule(33)
elseif phase == 3 then
timerVileSpirit:Start(20)
@@ -34,8 +34,8 @@
local berserkTimer = mod:NewBerserkTimer(300)
-local warnGoo = mod:NewSpellAnnounce(72458, 4)
-local timerGooCD = mod:NewCDTimer(10, 72458)
+local warnGoo = mod:NewSpellAnnounce(72549, 4)
+local timerGooCD = mod:NewCDTimer(10, 72549)
mod:AddBoolOption("RangeFrame", mod:IsRanged())
mod:AddBoolOption("SetIconOnGasSpore", true)
@@ -447,7 +447,8 @@
WarnPhase3Soon = "Phase 3 transition soon",
specWarnDefileCast = "Defile on you - Move away",
specWarnDefileNear = "Defile near you - Watch out",
- warnNecroticPlagueJump = "Necrotic Plague jumped to >%s<"
+ warnNecroticPlagueJump = "Necrotic Plague jumped to >%s<",
+ WarningValkyrSpawned = "Val'kyr Shadowguard spawn (%d)"
}
L:SetTimerLocalization{
@@ -464,6 +465,7 @@
TimerNecroticPlagueCleanse = "Show timer to cleanse Necrotic Plague before\nthe first tick",
PhaseTransition = "Show time for phase transitions",
WarnPhase2Soon = "Show pre-warning for Phase 2 transition (at ~73%)",
+ WarningValkyrSpawned = "Show warning for Val'kyr Shadowguard spawns",
WarnPhase3Soon = "Show pre-warning for Phase 3 transition (at ~43%)",
specWarnDefileCast = "Show special warning for $spell:72762 on you",
specWarnDefileNear = "Show special warning for $spell:72762 near you",