Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small Nax SoD updates #291

Merged
merged 2 commits into from
Dec 22, 2024
Merged

Small Nax SoD updates #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ce382d
Razuvious: Add var timer for shout and minor SoD update
emmericp Dec 22, 2024
ec1374d
Naxx: Split stats by normal/heroic/mythic on SoD
emmericp Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/ArachnidQuarter/Anub'Rekhan.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("AnubRekhanVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15956)
mod:SetEncounterID(1107)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/ArachnidQuarter/Faerlina.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("FaerlinaVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15953)
mod:SetEncounterID(1110)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/ArachnidQuarter/Maexxna.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("MaexxnaVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15952)
mod:SetEncounterID(1116)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/ConstructQuarter/Gluth.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("GluthVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15932)
mod:SetEncounterID(1108)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/ConstructQuarter/Grobbulus.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("GrobbulusVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15931)
mod:SetEncounterID(1111)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/ConstructQuarter/Patchwerk.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("PatchwerkVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(16028)
mod:SetEncounterID(1118)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/ConstructQuarter/Thaddius.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
local mod = DBM:NewMod("ThaddiusVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15928)
mod:SetEncounterID(1120)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/FrostwyrmLair/Kel'Thuzad.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("KelThuzadVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15990)
mod:SetEncounterID(1114)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/FrostwyrmLair/Sapphiron.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("SapphironVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15989)
mod:SetEncounterID(1119)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/MilitaryQuarter/Gothik.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("GothikVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(16060)
mod:SetEncounterID(1109)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/MilitaryQuarter/Horsemen.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("HorsemenVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(16062, 16063, 16064, 16065)--30549
mod:SetEncounterID(1121)
Expand Down
32 changes: 22 additions & 10 deletions DBM-Raids-Vanilla/VanillaNaxx/MilitaryQuarter/Razuvious.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,43 @@ mod:SetZone(533)

mod:RegisterCombat("combat_yell", L.Yell1, L.Yell2, L.Yell3, L.Yell4)

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:RegisterEventsInCombat(
"SPELL_CAST_SUCCESS 29107 29060 29061",--55543
"UNIT_DIED"
)

--TODO, find out if args:IsPetSource() actually works, or find something else that does
--[[
ability.id = 29107 and type = "cast"
--]]
local warnShoutNow = mod:NewSpellAnnounce(29107, 1)
local warnShoutSoon = mod:NewSoonAnnounce(29107, 3)
local warnShoutNow = mod:NewSpellAnnounce(29107, 1, 6673)
local warnShoutSoon = mod:NewSoonAnnounce(29107, 3, 6673)
local warnShieldWall = mod:NewAnnounce("WarningShieldWallSoon", 3, 29061)

local timerShout = mod:NewCDTimer(25.8, 29107, nil, nil, nil, 2)-- 25.87-25.96 in classic, 16 in wrath
local timerShout = mod:NewCDTimer(25.8, 29107, nil, nil, nil, 2, 6673)-- 25.87-25.96 in classic, 16 in wrath
local timerTaunt = mod:NewCDTimer(60, 29060, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerShieldWall = mod:NewBuffFadesTimer(20, 29061, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)

function mod:OnCombatStart(delay)
timerShout:Start(24 - delay)--It is 22-26 variation, but since users complained, using the median instead of the minimum
if DBM:IsSeasonal("SeasonOfDiscovery") then
-- This might also bee true for Era, old comment mentioned 22-26, but I'm pretty sure these fights were mostly unchanged on SoD
timerShout:Start("v25-26.34")
else
timerShout:Start("v22-26")
end
warnShoutSoon:Schedule(19 - delay)
end

function mod:SPELL_CAST_SUCCESS(args)
if args:IsSpell(29107) then--What does an MCed unit return?
timerShout:Start()
if args:IsSpell(29107) then
if DBM:IsSeasonal("SeasonOfDiscovery") then
-- Might be the same as the initial pull on SoD
timerShout:Start("v25.4-26.34")
else
timerShout:Start()
end
warnShoutNow:Show()
warnShoutSoon:Schedule(20)
elseif args:IsSpell(29060) and args:IsPetSource() then -- Taunt
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/PlagueQuarter/Heigan.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("HeiganVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15936)
mod:SetEncounterID(1112)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/PlagueQuarter/Loatheb.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("LoathebVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(16011)
mod:SetEncounterID(1115)
Expand Down
6 changes: 6 additions & 0 deletions DBM-Raids-Vanilla/VanillaNaxx/PlagueQuarter/Noth.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
local mod = DBM:NewMod("NothVanilla", "DBM-Raids-Vanilla", 1)
local L = mod:GetLocalizedStrings()

if DBM:IsSeasonal("SeasonOfDiscovery") then
mod.statTypes = "normal,heroic,mythic"
else
mod.statTypes = "normal"
end

mod:SetRevision("@file-date-integer@")
mod:SetCreatureID(15954)
mod:SetEncounterID(1117)
Expand Down
4 changes: 4 additions & 0 deletions DBM-Test-Vanilla/DBM-Test-Vanilla_Vanilla.toc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
## LoadOnDemand: 1
## X-DBM-Test: true

# Nax
Season of Discovery/Naxxramas/Razuvious-PTR.lua
Season of Discovery/Naxxramas/Reports/Razuvious-PTR.lua

# AQ40
Season of Discovery/AQ40/Skeram-Hardmode.lua
Season of Discovery/AQ40/ThreeBugs-Hardmode.lua
Expand Down
Loading
Loading