diff --git a/BlackwingLair/Firemaw.lua b/BlackwingLair/Firemaw.lua index 35ef330..acc9394 100644 --- a/BlackwingLair/Firemaw.lua +++ b/BlackwingLair/Firemaw.lua @@ -25,7 +25,7 @@ if mod:GetSeason() == 2 then 23339, -- Wing Buffet 22539, -- Shadow Flame 23341, -- Flame Buffet - 366305, -- Static Electricity + {366305, "ME_ONLY_EMPHASIZE"}, -- Static Electricity } end end @@ -73,7 +73,7 @@ end function mod:StaticElectricityApplied(args) if self:Me(args.destGUID) and args.amount >= 4 and args.amount % 2 == 0 then - self:StackMessage(args.spellId, "blue", args.destName, args.amount, 6) + self:StackMessage(args.spellId, "blue", args.destName, args.amount, 8) if args.amount >= 6 then self:PlaySound(args.spellId, "warning", nil, args.destName) end diff --git a/BlackwingLair/Razorgore.lua b/BlackwingLair/Razorgore.lua index 378cf3e..bad0c23 100644 --- a/BlackwingLair/Razorgore.lua +++ b/BlackwingLair/Razorgore.lua @@ -13,6 +13,7 @@ mod:SetStage(1) -- local eggs = 0 +local timer = nil -------------------------------------------------------------------------------- -- Localization @@ -57,7 +58,10 @@ function mod:OnEngage() self:SetStage(1) self:Message("stages", "cyan", CL.stage:format(1), false) self:Bar("stages", 45, CL.adds, "Spell_Holy_PrayerOfHealing") - self:Bar("stages", 120, CL.big_add, "inv_misc_head_dragon_01") + if self:GetSeason() == 2 then + self:Bar("stages", 120, CL.big_add, "inv_misc_head_dragon_01") + timer = self:ScheduleTimer("BigAdd", 120) + end end -------------------------------------------------------------------------------- @@ -79,6 +83,16 @@ function mod:DominateMind(args) end end +function mod:BigAdd() + self:StopBar(CL.big_add) + if timer then + self:CancelTimer(timer) + timer = nil + end + self:Message("stages", "cyan", CL.big_add, "inv_misc_head_dragon_01") + self:PlaySound("stages", "long") +end + function mod:DestroyEgg() eggs = eggs + 1 self:Message("eggs", "green", L.eggs_message:format(eggs), L.eggs_icon) @@ -87,9 +101,7 @@ function mod:DestroyEgg() self:Message("stages", "cyan", CL.stage:format(2), false) self:PlaySound("stages", "long") elseif eggs == 10 and self:GetSeason() == 2 then - self:StopBar(CL.big_add) - self:Message("stages", "cyan", CL.big_add, "inv_misc_head_dragon_01") - self:PlaySound("stages", "long") + self:BigAdd() end end diff --git a/BlackwingLair/Trash.lua b/BlackwingLair/Trash.lua index b1ee714..30a7f71 100644 --- a/BlackwingLair/Trash.lua +++ b/BlackwingLair/Trash.lua @@ -5,19 +5,26 @@ local mod, CL = BigWigs:NewBoss("Blackwing Lair Trash", 469) if not mod then return end mod.displayName = CL.trash -mod:RegisterEnableMob( - 12460, -- Death Talon Wyrmguard - 12461, -- Death Talon Overseer - 12557, -- Grethok the Controller - 13020, -- Vaelastrasz - 12017, -- Broodlord Lashlayer - 11983, -- Firemaw - 14601, -- Ebonroc - 11981, -- Flamegor - 14020, -- Chromaggus - 11583, -- Nefarian - 10162 -- Lord Victor Nefarius -) +if mod:GetSeason() == 2 then + mod:RegisterEnableMob( + 12460, -- Death Talon Wyrmguard + 12461, -- Death Talon Overseer + 12557, -- Grethok the Controller + 13020, -- Vaelastrasz + 12017, -- Broodlord Lashlayer + 11983, -- Firemaw + 14601, -- Ebonroc + 11981, -- Flamegor + 14020, -- Chromaggus + 11583, -- Nefarian + 10162 -- Lord Victor Nefarius + ) +else + mod:RegisterEnableMob( + 12460, -- Death Talon Wyrmguard + 12461 -- Death Talon Overseer + ) +end -------------------------------------------------------------------------------- -- Locals @@ -61,6 +68,7 @@ if mod:GetSeason() == 2 then {466435, "SAY", "SAY_COUNTDOWN", "ME_ONLY_EMPHASIZE"}, -- Nature's Fury },{ ["target_vulnerability"] = L.wyrmguard_overseer, + [466357] = CL.general, } end end @@ -76,15 +84,17 @@ function mod:OnRegister() end function mod:OnBossEnable() - --self:RegisterMessage("BigWigs_OnBossEngage", "Disable") - self:RegisterEvent("PLAYER_TARGET_CHANGED") if self:Vanilla() then self:Log("SPELL_AURA_APPLIED", "DetectMagicApplied", 2855) end if self:GetSeason() == 2 then self:Log("SPELL_AURA_APPLIED", "ArcaneBombApplied", 466357) + self:Log("SPELL_AURA_REMOVED", "ArcaneBombRemoved", 466357) self:Log("SPELL_AURA_APPLIED", "NaturesFuryApplied", 466435) + self:Log("SPELL_AURA_REMOVED", "NaturesFuryRemoved", 466435) + else + self:RegisterMessage("BigWigs_OnBossEngage", "Disable") end end @@ -145,20 +155,38 @@ do end end +--[[ Season of Discovery ]]-- + function mod:ArcaneBombApplied(args) self:TargetMessage(args.spellId, "yellow", args.destName) + self:TargetBar(args.spellId, 8, args.destName) if self:Me(args.destGUID) then self:Yell(args.spellId, nil, nil, "Arcane Bomb") self:YellCountdown(args.spellId, 8, nil, 5) - self:PlaySound(args.spellId, "warning", nil, args.destName) end + self:PlaySound(args.spellId, "warning", nil, args.destName) +end + +function mod:ArcaneBombRemoved(args) + if self:Me(args.destGUID) then + self:CancelYellCountdown(args.spellId) + end + self:StopBar(args.spellName, args.destName) end function mod:NaturesFuryApplied(args) self:TargetMessage(args.spellId, "yellow", args.destName) + self:TargetBar(args.spellId, 8, args.destName) if self:Me(args.destGUID) then self:Say(args.spellId, nil, nil, "Natures Fury") self:SayCountdown(args.spellId, 8, nil, 5) self:PlaySound(args.spellId, "warning", nil, args.destName) end end + +function mod:NaturesFuryRemoved(args) + if self:Me(args.destGUID) then + self:CancelSayCountdown(args.spellId) + end + self:StopBar(args.spellName, args.destName) +end diff --git a/BlackwingLair/Vaelastrasz.lua b/BlackwingLair/Vaelastrasz.lua index b8e6566..b75194f 100644 --- a/BlackwingLair/Vaelastrasz.lua +++ b/BlackwingLair/Vaelastrasz.lua @@ -43,14 +43,13 @@ function mod:OnBossEnable() self:Log("SPELL_AURA_REMOVED", "BurningAdrenalineTankRemoved", 23620) if self:GetSeason() == 2 then self:Log("SPELL_AURA_APPLIED", "BurningAdrenalineAppliedSoD", 367987) - self:Log("SPELL_AURA_REMOVED", "BurningAdrenalineRemovedSoD", 367987) self:Log("SPELL_AURA_APPLIED", "BurningAdrenalineTankAppliedSoD", 469261) - self:Log("SPELL_AURA_REMOVED", "BurningAdrenalineTankRemovedSoD", 469261) + self:Log("SPELL_AURA_APPLIED_DOSE", "BurningAdrenalineTankAppliedDoseSoD", 469261) end end function mod:OnEngage() - self:CDBar(18173, self:GetSeason() == 2 and 25 or 16, CL.bomb) -- Burning Adrenaline + self:Bar(18173, self:GetSeason() == 2 and 22 or 16, CL.bomb) -- Burning Adrenaline self:Bar(23620, self:GetSeason() == 2 and 11 or 45, L.tank_bomb) -- Burning Adrenaline end @@ -88,25 +87,13 @@ function mod:BurningAdrenalineRemoved(args) end function mod:BurningAdrenalineAppliedSoD(args) - self:CDBar(18173, 17, CL.bomb) self:TargetMessage(18173, "yellow", args.destName, CL.bomb) - --self:PrimaryIcon(args.spellId, args.destName) - --self:TargetBar(args.spellId, 20, args.destName, CL.explosion) if self:Me(args.destGUID) then self:Say(18173, CL.bomb, nil, "Bomb") - --self:SayCountdown(args.spellId, 20, nil, 5) self:PlaySound(18173, "warning", nil, args.destName) end end -function mod:BurningAdrenalineRemovedSoD(args) - --if self:Me(args.destGUID) then - -- self:CancelSayCountdown(args.spellId) - --end - --self:PrimaryIcon(args.spellId) -- Next one is applied before previous one expires - self:StopBar(CL.explosion, args.destName) -end - function mod:BurningAdrenalineTank(args) self:Bar(args.spellId, 45, L.tank_bomb) end @@ -129,19 +116,16 @@ function mod:BurningAdrenalineTankRemoved(args) end function mod:BurningAdrenalineTankAppliedSoD(args) - self:Bar(23620, 30, L.tank_bomb) self:TargetMessage(23620, "purple", args.destName, L.tank_bomb) if self:Me(args.destGUID) then self:Say(23620, L.tank_bomb, nil, "Tank Bomb") - --self:SayCountdown(args.spellId, 20, nil, 5) end - --self:TargetBar(args.spellId, 20, args.destName, L.tank_bomb) self:PlaySound(23620, "long") end -function mod:BurningAdrenalineTankRemovedSoD(args) - --if self:Me(args.destGUID) then - -- self:CancelSayCountdown(args.spellId) - --end - self:StopBar(L.tank_bomb, args.destName) +function mod:BurningAdrenalineTankAppliedDoseSoD(args) + if args.amount % 10 == 0 then + self:StackMessage(23620, "purple", args.destName, args.amount, 30) + self:PlaySound(23620, "long") + end end