Skip to content

Commit

Permalink
Minor adjustments for some timers
Browse files Browse the repository at this point in the history
  • Loading branch information
emmericp committed Jan 19, 2025
1 parent fadfe1c commit 13bdad0
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/AQ40/Huhuran.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ local StingTargets = {}
function mod:OnCombatStart(delay)
self.vb.prewarn_berserk = false
table.wipe(StingTargets)
timerEnrageCD:Start(9.6-delay)
timerEnrageCD:Start(8.1-delay)
timerPoisonCD:Start(11-delay)
timerStingCD:Start(20-delay)
if self.Options.RangeFrame then
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/AQ40/Ouro.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ local specWarnEye = mod:NewSpecialWarning("SpecWarnEye", nil, nil, nil, 3, 2)
local timerSubmerge = mod:NewTimer(30, "TimerSubmerge", "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendBurrow.blp", nil, nil, 6)
local timerEmerge = mod:NewTimer(30, "TimerEmerge", "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendUnBurrow.blp", nil, nil, 6)
local timerSweepCD = mod:NewNextTimer(20.5, 26103, nil, "Tank", 2, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerBlastCD = mod:NewNextTimer(23, 26102, nil, nil, nil, 2)
local timerBlastCD = mod:NewNextTimer(22.6, 26102, nil, nil, nil, 2)
local timerNextEye = mod:NewNextTimer(30, 1215744)

mod.vb.prewarn_enrage = false
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/AQ40/Viscidus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mod.vb.volleyCount = 0

function mod:OnCombatStart(delay)
self.vb.volleyCount = 0
timerPoisonBoltVolleyCD:Start(12.9, 1)
timerPoisonBoltVolleyCD:Start(-delay, 1)
end

function mod:SPELL_CAST_SUCCESS(args)
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/BWL/Chromaggus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ local timerBreath = mod:NewTimer(2, "TimerBreath", 23316, nil, nil, 3)
local timerBreathCD = mod:NewTimer(60, "TimerBreathCD", 23316, nil, nil, 3)
local timerAllBreaths = mod:NewTimer(80, "TimerAllBreaths", 23316, nil, nil, 3)
local timerFrenzy = mod:NewBuffActiveTimer(8, 23128, nil, "Tank|RemoveEnrage|Healer", 3, 5, nil, DBM_COMMON_L.TANK_ICON..DBM_COMMON_L.ENRAGE_ICON)
local timerVuln = mod:NewTimer("v17-25.5", "TimerVulnCD", nil, nil, nil, nil, nil, true) -- seen 16.94 - 25.53, avg 21.8; extreme outliers are somewhat rare, so going for 19.5
local timerVuln = mod:NewTimer("v16.2-25.5", "TimerVulnCD", nil, nil, nil, nil, nil, true) -- seen 16.94 - 25.53, avg 21.8; extreme outliers are somewhat rare, so going for 19.5
local timerFetch = mod:NewCDTimer(40, 467884)
local timerRollOver = mod:NewBuffActiveTimer(16, 468199)

Expand Down
11 changes: 5 additions & 6 deletions DBM-Raids-Vanilla/BWL/Ebonroc_and_Flamegor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ local specWarnShadowYou = mod:NewSpecialWarningYou(23340, nil, nil, nil, 1, 2)
local specWarnShadow = mod:NewSpecialWarningTaunt(23340, nil, nil, nil, 1, 2)
local specWarnBrandofShadow = mod:NewSpecialWarningStack(368515, nil, 4, nil, nil, 1, 6)

local timerShadowCD = mod:NewCDTimer(25, 23340, nil, "Tank|Healer", 3, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerShadowCD = mod:NewVarTimer("v16.2-26", 23340, nil, "Tank|Healer", 3, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerShadow = mod:NewTargetTimer(8, 23340, nil, "Tank|Healer", 3, 5, nil, DBM_COMMON_L.TANK_ICON)

--Flamegore
Expand All @@ -80,8 +80,7 @@ local warnFrenzy = mod:NewSpellAnnounce(23342, 3, nil, "Tank|RemoveEnrage|Heal
local specWarnFrenzy = mod:NewSpecialWarningDispel(23342, "RemoveEnrage", nil, nil, 1, 6)
local specWarnBrandofFlame = mod:NewSpecialWarningStack(368521, nil, 4, nil, nil, 1, 6)

local timerFrenzyCD = mod:NewCDTimer(25, 23342, nil, "Tank|RemoveEnrage|Healer", nil, 5, nil, DBM_COMMON_L.ENRAGE_ICON)
local timerFrenzy = mod:NewBuffActiveTimer(10, 23342, nil, "Tank|RemoveEnrage|Healer", nil, 5, nil, DBM_COMMON_L.ENRAGE_ICON)
local timerFrenzyCD = mod:NewVarTimer("v16.2-26", 23342, nil, "Tank|RemoveEnrage|Healer", nil, 5, nil, DBM_COMMON_L.ENRAGE_ICON)local timerFrenzy = mod:NewBuffActiveTimer(10, 23342, nil, "Tank|RemoveEnrage|Healer", nil, 5, nil, DBM_COMMON_L.ENRAGE_ICON)

-- Polyfill because I don't feel like this justifies a forced core update
local function isBlackEssenceEnabled()
Expand All @@ -94,17 +93,17 @@ end

function mod:OnCombatStart(delay)
--Both
TimerBrandCD:Start(16-delay)
TimerBrandCD:Start(15.8-delay)
if isBlackEssenceEnabled() then
timerStop:Start(24 - delay)
end
timerShadowFlameCD:Start(29-delay)--29-50, yep, classic for you
timerWingBuffet:Start(40-delay)--40-42, better than shadow flame
specWarnWingBuffet:Schedule(36)
--Ebon
timerShadowCD:Start(27-delay)--27-37
timerShadowCD:Start()
--Flame
timerFrenzyCD:Start(27-delay)--27-38
timerFrenzyCD:Start()
end


Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/MC/Garr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ local warnAntiMagicPulse = mod:NewSpellAnnounce(19492, 2)
local warnImmolate = mod:NewTargetNoFilterAnnounce(15732, 2, nil, false, 3)

local timerAntiMagicPulseCD = mod:NewVarTimer("v15.7-21", 19492, nil, nil, nil, 2)--15.7-21 variation
local timerMagmakinCD = mod:NewCDTimer(5, 20506, nil, nil, nil, 1)--5-6.5 variation
local timerMagmakinCD = mod:NewCDTimer(4.8, 20506, nil, nil, nil, 1)--5-6.5 variation, SoD: 4.8-5.0

function mod:OnCombatStart(delay)
if DBM:IsSeasonal("SeasonOfDiscovery") then
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/MC/Geddon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ local specWarnIgnite = mod:NewSpecialWarningDispel(19659, "RemoveMagic", nil, ni
local timerInfernoCD = mod:NewVarTimer("v21-27.9", 19695, nil, nil, nil, 2)--21-27.9 (24-30 on sod?)
local timerInferno = mod:NewBuffActiveTimer(8, 19695, nil, nil, nil, 2)
local timerIgniteManaCD = mod:NewVarTimer("v27-33", 19659, nil, nil, nil, 2)--27-33
local timerBombCD = mod:NewVarTimer("v13.3-21", 20475, nil, nil, nil, 3)--13.3-21
local timerBombCD = mod:NewVarTimer("v11.7-21", 20475, nil, nil, nil, 3)
local timerBomb = mod:NewTargetTimer(8, 20475, nil, nil, nil, 3)
local timerArmageddon = mod:NewCastTimer(8, 20478, nil, nil, nil, 2, nil, nil, nil, nil, nil, nil, nil, nil, nil, true)

Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/MC/Gehennas.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local warnFist = mod:NewTargetAnnounce(20277, 2, nil, false, 2)

local specWarnGTFO = mod:NewSpecialWarningGTFO(19717, nil, nil, nil, 1, 8)

local timerRoF = mod:NewCDTimer(6, 19717, nil, false, nil, 3)
local timerRoF = mod:NewCDTimer(4.8, 19717, nil, false, nil, 3)
local timerCurse = mod:NewVarTimer("v26.7-30", 19716, nil, nil, nil, 3, nil, DBM_COMMON_L.HEALER_ICON..DBM_COMMON_L.CURSE_ICON)--26.7-30
--local timerFist = mod:NewBuffActiveTimer(4, 20277, nil, false, 2, 3)

Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/MC/Lucifron.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ mod.vb.lastIcon = 1

function mod:OnCombatStart(delay)
self.vb.lastIcon = 1
timerDoomCD:Start(7-delay)--7-8
timerDoomCD:Start(6.5-delay)--6.5-8
timerCurseCD:Start(12-delay)--12-15
end

Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/MC/Majordomo.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ local specWarnDamageShield = mod:NewSpecialWarningReflect(21075, "Melee", nil, n
local timerMagicReflect = mod:NewBuffActiveTimer(10, 20619, nil, nil, nil, 5, nil, DBM_COMMON_L.DAMAGE_ICON)
local timerDamageShield = mod:NewBuffActiveTimer(10, 21075, nil, nil, nil, 5, nil, DBM_COMMON_L.DAMAGE_ICON)
local timerTeleportCD = mod:NewVarTimer("v25-30", 20534, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)--25-30
local timerShieldCD = mod:NewTimer(30.3, "timerShieldCD", nil, nil, nil, 6, DBM_COMMON_L.DAMAGE_ICON)--33.9 on SoD
local timerShieldCD = mod:NewTimer(27, "timerShieldCD", nil, nil, nil, 6, DBM_COMMON_L.DAMAGE_ICON)

-- New in SoD
-- https://sod.warcraftlogs.com/reports/6RBYhaHdc17x94J8#fight=64&type=casts&by=ability&view=events&hostility=1
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/MC/Shazzrah.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ local warnCntrSpell = mod:NewSpellAnnounce(19715, 3, nil, "SpellCaster", 2)
local specWarnDeadenMagic = mod:NewSpecialWarningDispel(19714, false, nil, 2, 1, 2)
local specWarnGate = mod:NewSpecialWarningTaunt(23138, "Tank", nil, nil, 1, 2)--aggro wipe, needs fresh taunt

local timerCurseCD = mod:NewVarTimer("v22-25.5", 19713, nil, nil, nil, 3, nil, DBM_COMMON_L.CURSE_ICON)--22-25.5 (20-25?)
local timerCurseCD = mod:NewVarTimer("v18-25.5", 19713, nil, nil, nil, 3, nil, DBM_COMMON_L.CURSE_ICON)
local timerDeadenMagic = mod:NewBuffActiveTimer(30, 19714, nil, false, 3, 5, nil, DBM_COMMON_L.MAGIC_ICON)
local timerGateCD = mod:NewVarTimer("v41.3-50", 23138, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON)--41-50
local timerCounterSpellCD = mod:NewVarTimer("v15-19", 19715, nil, "SpellCaster", nil, 3)--15-19
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-Vanilla/VanillaSoD_SunkenTemple/Atalalarion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ local warnPillarsOfMight = mod:NewCountAnnounce(437503, 3)
local specWarnDemolishingSmash = mod:NewSpecialWarningCount(437597, nil, nil, nil, 2, 2)

--12.2-14.6 "Pillars of Might-437503-npc:218624-0000143F40 = pull:6.4, 21.0, 13.4, 13.7, 12.2, 18.3, 13.6, 14.6, 13.6, 15.6",
local timerPillarsofMightCD = mod:NewCDCountTimer(12.2, 437503, nil, nil, nil, 1, nil, DBM_COMMON_L.DAMAGE_ICON)
local timerPillarsofMightCD = mod:NewCDCountTimer(12, 437503, nil, nil, nil, 1, nil, DBM_COMMON_L.DAMAGE_ICON)
--27.1-29.2 "Demolishing Smash-437597-npc:218624-0000143F40 = pull:21.3, 27.1, 29.1, 29.1, 29.2"
local timerDemolishingSmashCD = mod:NewCDCountTimer(27.1, 437597, nil, nil, nil, 3)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ local specWarnGTFO = mod:NewSpecialWarningGTFO(443953, nil, nil, nil, 1, 8)
local timerBubblingBloodCD = mod:NewCDTimer(9.7, 443940, nil, nil, nil, 3)
local timerSpiritChainsCD = mod:NewCDTimer(16.2, 443975, nil, nil, nil, 3)
local timerFrightsomeHowlCD = mod:NewCDTimer(16.2, 443990, nil, nil, nil, 4, nil, DBM_COMMON_L.INTERRUPT_ICON)
local timerBloodNovaCD = mod:NewCDCountTimer(8, 444050, nil, false, nil, 2)
local timerBloodNovaCD = mod:NewCDCountTimer(6.5, 444050, nil, false, nil, 2)
local timerInsanityCD = mod:NewCDCountTimer(27.5, 444039, nil, nil, nil, 3)--27.5-30.3
local timerCorruptedBloodCD = mod:NewCDCountTimer(16.2, 444253, nil, nil, nil, 3)
local timerCurseofTonguesCD = mod:NewCDCountTimer(32.3, 444046, nil, nil, nil, 3, nil, DBM_COMMON_L.CURSE_ICON)
Expand Down
8 changes: 4 additions & 4 deletions DBM-Raids-Vanilla/VanillaSoD_SunkenTemple/JammalanAndOgom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ local specWarnMassPenance = mod:NewSpecialWarningDodge(437921, nil, nil, nil,
local specWarnGTFO = mod:NewSpecialWarningGTFO(437884, nil, nil, nil, 1, 8)
local specWarnPowerWordShieldPurge = mod:NewSpecialWarningDispel(437930, "MagicDispeller", nil, nil, 1, 2)

local timerHolyFireCD = mod:NewCDTimer(13.4, 437809, nil, nil, nil, 5, nil, DBM_COMMON_L.MAGIC_ICON)
local timerHolyNovaCD = mod:NewCDTimer(17.3, 437817, nil, nil, nil, 3)
local timerHolyFireCD = mod:NewCDTimer(13.3, 437809, nil, nil, nil, 5, nil, DBM_COMMON_L.MAGIC_ICON)
local timerHolyNovaCD = mod:NewCDTimer(14.8, 437817, nil, nil, nil, 3)
local timerMortalLashCD = mod:NewCDTimer(25.4, 437847, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerAgonizingWeaknessCD = mod:NewCDTimer(27.1, 437868, nil, nil, nil, 3, nil, DBM_COMMON_L.CURSE_ICON)
local timerShadowSermonPainCD = mod:NewCDTimer(22.2, 437927, nil, nil, nil, 5, nil, DBM_COMMON_L.MAGIC_ICON)
local timerShadowSermonPainCD = mod:NewCDTimer(20.7, 437927, nil, nil, nil, 5, nil, DBM_COMMON_L.MAGIC_ICON)
local timerPsychicScreamCD = mod:NewCDTimer(43.7, 437928, nil, nil, nil, 3, nil, DBM_COMMON_L.MAGIC_ICON)--Can be delayed by other casts
local timerMassPenanceCD = mod:NewCDTimer(21, 437921, nil, nil, nil, 3)
local timerPWSCD = mod:NewCDTimer(15.8, 437930, nil, nil, nil, 5)--15.8-23 (lowest spell priority, so gets queued often)
local timerPWSCD = mod:NewCDTimer(14.7, 437930, nil, nil, nil, 5)--15.8-23 (lowest spell priority, so gets queued often)
-- "Hammers of Justice-437915-npc:218718-000016C225 = pull:121.8, 35.5, 35.0"
local timerHammersOfJustice = mod:NewNextTimer(35.0, 437915, nil, nil, nil, 3)
-- "Consecration-437884-npc:218718-000016C225 = pull:103.9, 16.2, 16.2, 15.8, 16.6, 16.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function mod:OnCombatStart(delay)
--One will be at 6.1-6.2 and other at 7.7-7.8
-- timerBackfireCD:Start(6.2-delay, 1)
-- timerDreamersLamentCD:Start(6.2-delay, 1)
timerCorruptedBreathCD:Start(10.6-delay)
timerCorruptedBreathCD:Start(9.7-delay)
self:SetStage(1)
end

Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-Vanilla/VanillaSoD_SunkenTemple/ShadeOfEranikus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ local specWarnLethargicPoisonAdd = mod:NewSpecialWarningInterruptCount(437425, n
local specWarnGTFO = mod:NewSpecialWarningGTFO(445575, nil, nil, nil, 1, 8)

--local timerThrashCD = mod:NewCDTimer(16.1, 3391, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)--16-49, seems to be filler GCD of boss so used in spell gaps
local timerCorrosiveBreathCD = mod:NewCDTimer(19.3, 437353, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)--19.3 except when spell queued
local timerDeepSlumberCD = mod:NewCDCountTimer(19.4, 437301, nil, nil, nil, 3)--19.4 except when spell queued
local timerCorrosiveBreathCD = mod:NewCDTimer(19.1, 437353, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)--19.1 except when spell queued
local timerDeepSlumberCD = mod:NewCDCountTimer(19, 437301, nil, nil, nil, 3)--19 except when spell queued
local timerLethargicPoisonCD = mod:NewCDTimer(19.3, 437390, nil, nil, nil, 3, nil, DBM_COMMON_L.POISON_ICON)
local timerBellowingRoarCD = mod:NewCDCountTimer(33.5, 445498, nil, nil, nil, 4, nil, DBM_COMMON_L.INTERRUPT_ICON)--33.5 but often spell queued due to lowest cast priority, delaying it often
local timerWakingNightmareCD = mod:NewCDCountTimer(66.3, 437398, nil, nil, nil, 2, nil, DBM_COMMON_L.DEADLY_ICON)
Expand Down

0 comments on commit 13bdad0

Please sign in to comment.