Skip to content

Commit

Permalink
Some misc fixes observed yesterday across scenarios
Browse files Browse the repository at this point in the history
  • Loading branch information
MysticalOS committed May 18, 2024
1 parent 2dbd9a7 commit a3971e7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
2 changes: 2 additions & 0 deletions DBM-Raids-MoP/MogushanVaults/Feng.lua
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ function mod:SPELL_AURA_APPLIED(args)
timerArcaneVelocity:Start()
if DBM:UnitBuff("player", nullBarrier) and self:IsDifficulty("lfr25") then
specWarnBarrierNow:Show()
specWarnBarrierNow:Play("useextraaction")
end
end
end
Expand Down Expand Up @@ -304,6 +305,7 @@ function mod:SPELL_CAST_START(args)
timerEpicenterCD:Start(nil, self.vb.specialCount + 1)
if DBM:UnitBuff("player", nullBarrier) and self:IsDifficulty("lfr25") then
specWarnBarrierNow:Schedule(2)
specWarnBarrierNow:ScheduleVoice(2, "useextraaction")
end
elseif args:IsSpellID(116157, 116295) then
warnLightningFists:Show()
Expand Down
4 changes: 2 additions & 2 deletions DBM-Scenario-MoP/BattleHighSeas.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ local specWarnSwashbuckling = mod:NewSpecialWarningDefensive(141438, nil, nil,
--Lieutenant Fizzel
local specWarnVolatileConcoction= mod:NewSpecialWarningRun(141327, nil, nil, nil, 4, 2)
--Admiral Hagman
local specWarnVerticalSlash = mod:NewSpecialWarningDefensive(141187, nil, nil, nil, 1, 2)
local specWarnVerticalSlash = mod:NewSpecialWarningDefensive(141187, nil, nil, nil, 1, 12)
local specWarnCounterShot = mod:NewSpecialWarningCast(136473, "SpellCaster", nil, nil, 1, 2)

--Lieutenant Drak'on
Expand All @@ -45,7 +45,7 @@ function mod:SPELL_CAST_START(args)
elseif args.spellId == 141187 then
if self:IsTanking("player", nil, nil, true, args.sourceGUID) then
specWarnVerticalSlash:Show()
specWarnVerticalSlash:Play("defensive")
specWarnVerticalSlash:Play("useextraaction")
end
timerVerticalSlashCD:Start()
elseif args.spellId == 136473 then
Expand Down
10 changes: 8 additions & 2 deletions DBM-Scenario-MoP/BrewingStorm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ mod:RegisterCombat("scenario", 1005)

mod:RegisterEventsInCombat(
"SPELL_CAST_START 115013",
"SPELL_CAST_SUCCESS 115013",
"SPELL_AURA_APPLIED 122142",
"CHAT_MSG_MONSTER_SAY",
"UNIT_DIED"
Expand All @@ -18,12 +19,17 @@ local warnEarthShattering = mod:NewSpellAnnounce(122142, 3)

--Borokhula the Destroyer
local timerSwampSmashCD = mod:NewCDTimer(8, 115013, nil, nil, nil, 3)
local timerEarthShatteringCD = mod:NewCDTimer(18, 122142, nil, nil, nil, 3)--Limited sample size, may be shorter
local timerEarthShatteringCD = mod:NewCDTimer(15.8, 122142, nil, nil, nil, 3)

function mod:SPELL_CAST_START(args)
if args.spellId == 115013 then
warnSwampSmash:Show()
timerSwampSmashCD:Start()
end
end

function mod:SPELL_CAST_SUCCESS(args)
if args.spellId == 115013 then
timerSwampSmashCD:Start(6)--Only start timer if cast finishes. Boss can be stunned and it interrupts cast but doesn't put it on CD
end
end

Expand Down
2 changes: 1 addition & 1 deletion DBM-Scenario-MoP/CryptofKings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ local timerRelentless = mod:NewTargetTimer(10, 120817, nil, nil, nil, 5)
local timerEnrage = mod:NewBuffActiveTimer(10, 127823, nil, nil, nil, 5, nil, DBM_COMMON_L.ENRAGE_ICON)
--local timerRelentlessCD = mod:NewCDTimer(10, 120817)
--Abomination of Anger
local timerBreathCD = mod:NewCDTimer(21.5, 120929, nil, nil, nil, 3)--Limited sample size, may be shorter
local timerBreathCD = mod:NewCDTimer(18.2, 120929, nil, nil, nil, 3)
local timerCloudofAngerCD = mod:NewCDTimer(17, 120824, nil, nil, nil, 3)--Limited sample size, may be shorter
local timerDarkforce = mod:NewCastTimer(5, 120215, nil, nil, nil, 5)
local timerDarkforceCD = mod:NewCDTimer(32, 120215, nil, nil, nil, 3)
Expand Down
11 changes: 4 additions & 7 deletions DBM-Scenario-MoP/DarkHeartPandaria.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@ local warnMalevolentForce = mod:NewCastAnnounce(142840, 4, 2)
local specWarnStoneRain = mod:NewSpecialWarningInterrupt(142139, "HasInterrupt", nil, nil, 1, 2)
local specWarnSpellShatter = mod:NewSpecialWarningCast(141421, "SpellCaster", nil, 3, 1, 2)
local specWarnSummonFieryAnger = mod:NewSpecialWarningInterrupt(141488, "HasInterrupt", nil, nil, 1, 2)
local specWarnDetonate = mod:NewSpecialWarningRun(141456)--Technically can kill it too vs run, but I favor run strategy more.
--Urtharges the Destroyer
local specWarnRuptureLine = mod:NewSpecialWarningMoveAway(141418, nil, nil, nil, 1, 2)
--Echo of Y'Shaarj
local specWarnMalevolentForce = mod:NewSpecialWarningInterrupt(142840, "HasInterrupt", nil, nil, 1, 2)--Not only cast by last boss but trash near him as well, interrupt important for both. Although only bosses counts for achievement.

--Trash
local timerSpellShatter = mod:NewCastTimer(2, 141421, nil, "SpellCaster", nil, 2)
--local timerSpellShatter = mod:NewCDTimer(2, 141421, nil, nil, nil, 2)--Refine and nameplate timer maybe?

function mod:SPELL_CAST_START(args)
if args.spellId == 142139 and self:AntiSpam(3, 1) then
Expand All @@ -46,7 +45,6 @@ function mod:SPELL_CAST_START(args)
elseif args.spellId == 141421 then
specWarnSpellShatter:Show()
specWarnSpellShatter:Play("stopcast")
timerSpellShatter:Start(nil, args.sourceGUID)
elseif args.spellId == 141421 and self:AntiSpam(3, 2) then
if self.Options.SpecWarn141421interrupt and self:CheckInterruptFilter(args.sourceGUID, nil, true) then
specWarnSummonFieryAnger:Show(args.sourceName)
Expand All @@ -72,20 +70,19 @@ function mod:SPELL_CAST_SUCCESS(args)
else
warnRuptureLine:Show(args.destName)
end
elseif args.spellId == 141456 then
elseif args.spellId == 141456 and self:AntiSpam(2, 1) then
warnDetonate:Show()
specWarnDetonate:Show()
end
end

function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
if spellId == 141872 and self:AntiSpam(3, 1) then--Call Elemental
if spellId == 141872 and self:AntiSpam(3, 2) then--Call Elemental
self:SendSync("CallElemental")
end
end

function mod:CHAT_MSG_MONSTER_YELL(msg)
if (msg == L.summonElemental or msg:find(L.summonElemental)) and self:AntiSpam(3, 1) then
if (msg == L.summonElemental or msg:find(L.summonElemental)) and self:AntiSpam(3, 2) then
self:SendSync("CallElemental")
end
end
Expand Down

0 comments on commit a3971e7

Please sign in to comment.