Skip to content

Commit

Permalink
Update freezing arrow now that it no longer can be interrupted on Sar…
Browse files Browse the repository at this point in the history
…evess. It'll warn if you're standing in trap with GTFO alert and when players (or add) are frozen by it.
  • Loading branch information
MysticalOS committed Dec 9, 2023
1 parent 31ae424 commit 51d5904
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 16 deletions.
16 changes: 8 additions & 8 deletions DBM-Raids-Vanilla/VanillaSoD_BFD/Gelihast.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ function mod:SPELL_CAST_SUCCESS(args)
elseif args:IsSpell(412528) and self:AntiSpam(5, 1) then
warnGroundRupture:Show()
timerGroundRuptureCD:Start()
-- elseif args:IsSpell(412456) and self:AntiSpam(25, 2) then--Backup, but USCS is faster and more accurate
-- self:SetStage(0)
-- --Boss stops casting these during murlocs
-- timerCurseofBlackfathomCD:Stop()
-- timerShadowStrikeCD:Stop()
-- timerShadowCrashCD:Stop()
-- warnMarchofMurlocs:Show()
elseif args:IsSpell(412456) and self:AntiSpam(25, 2) then--Backup, but USCS is faster and more accurate
self:SetStage(0)
--Boss stops casting these during murlocs
timerCurseofBlackfathomCD:Stop()
timerShadowStrikeCD:Stop()
timerShadowCrashCD:Stop()
warnMarchofMurlocs:Show()
end
end

Expand Down Expand Up @@ -82,7 +82,7 @@ end

function mod:OnSync(msg)
if not self:IsInCombat() then return end
if msg == "PhaseChange" and self:AntiSpam(5, 2) then
if msg == "PhaseChange" and self:AntiSpam(30, 2) then
self:SetStage(0)
--Boss stops casting these during murlocs
timerCurseofBlackfathomCD:Stop()
Expand Down
24 changes: 16 additions & 8 deletions DBM-Raids-Vanilla/VanillaSoD_BFD/LadySarevess.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ local L = mod:GetLocalizedStrings()
mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(204068)
mod:SetEncounterID(2699)--2762 is likely 5 man version in instance type 201
mod:SetHotfixNoticeRev(20231201000000)
mod:SetHotfixNoticeRev(20231208000000)
--mod:SetMinSyncRevision(20231115000000)

mod:RegisterCombat("combat")

mod:RegisterEventsInCombat(
"SPELL_CAST_START 407568",
"SPELL_CAST_SUCCESS 407794 407653",
"SPELL_AURA_APPLIED 407791 407653",
"SPELL_AURA_APPLIED 407791 407653 407548 407546",
"UNIT_DIED"
)

Expand All @@ -21,13 +21,14 @@ mod:RegisterEventsInCombat(
--TODO, add cleave at all? 407811
local warningAkumaisRage = mod:NewTargetNoFilterAnnounce(407791, 3, nil, "Healer|Tank|RemoveEnrage")
local warningForkedLightning = mod:NewTargetNoFilterAnnounce(407653, 3)
local warningFreezingArrowStun = mod:NewTargetNoFilterAnnounce(407546, 2)

local specWarnForkedLightning = mod:NewSpecialWarningMoveAway(407653, nil, nil, nil, 1, 2)
local yellnForkedLightning = mod:NewYell(407653)
local specWarnFreezingArrow = mod:NewSpecialWarningInterrupt(407568, "HasInterrupt", nil, nil, 1, 2)
local specWarnFreezingArrow = mod:NewSpecialWarningGTFO(407568, nil, nil, nil, 1, 8)

local timerForkedLightningCD = mod:NewCDTimer(20.6, 407653, nil, nil, nil, 3)
local timerFreezingArrowCD = mod:NewCDTimer(22.9, 407568, nil, nil, nil, 4, nil, DBM_COMMON_L.INTERRUPT_ICON)
local timerFreezingArrowCD = mod:NewCDTimer(22.9, 407568, nil, nil, nil, 3)
local timerTriplePunctureCD = mod:NewCDNPTimer(10.9, 407794, nil, nil, nil, 5)

function mod:OnCombatStart(delay)
Expand All @@ -38,10 +39,6 @@ end
function mod:SPELL_CAST_START(args)
if args:IsSpell(407568) then
timerFreezingArrowCD:Start()
if self:CheckInterruptFilter(args.sourceGUID, false, true) then
specWarnFreezingArrow:Show(args.sourceName)
specWarnFreezingArrow:Play("kickcast")
end
end
end

Expand All @@ -64,6 +61,17 @@ function mod:SPELL_AURA_APPLIED(args)
else
warningForkedLightning:Show(args.destName)
end
elseif args:IsSpell(407548) then
if args:IsPlayer() and self:AntiSpam(3, 2) then
specWarnFreezingArrow:Show(args.spellName)
specWarnFreezingArrow:Play("watchfeet")
end
elseif args:IsSpell(407546) then
if args:IsDestTypeHostile() then--Add, without aggregation
warningFreezingArrowStun:Show(args.destName)
elseif args:IsDestTypePlayer() then--Players with 1 sec agggregation
warningFreezingArrowStun:CombinedShow(1, args.destName)
end
end
end

Expand Down

0 comments on commit 51d5904

Please sign in to comment.