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

Aq20 tests and trash updates #273

Merged
merged 5 commits into from
Dec 15, 2024
Merged

Aq20 tests and trash updates #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eca6794
AQ20: Add test data
emmericp Dec 15, 2024
cef6401
AQ20 Trash: Fix bad logic for counting ghosts
emmericp Dec 15, 2024
b664eea
AQ20 Trash: Track some more trash abilities
emmericp Dec 15, 2024
e97fd23
AQ Trash: Add warning and tracking for Guardian add summon ability
emmericp Dec 15, 2024
1cf191a
AQ Trash: Show spell name for Toxic Pool GTFO warning
emmericp Dec 15, 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
32 changes: 28 additions & 4 deletions DBM-Raids-Vanilla/AQ20/AQ20Trash.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ mod:RegisterEvents(
"SPELL_PERIODIC_DAMAGE 1215421",
"SPELL_CAST_SUCCESS 26586",
"SPELL_AURA_REMOVED 22997",
"SPELL_SUMMON 17430 17431",
"SPELL_MISSED",
"UNIT_DIED",
"SPELL_DAMAGE 14297 24340 8732",
"PLAYER_TARGET_CHANGED",
"NAME_PLATE_UNIT_ADDED"
)
Expand All @@ -43,6 +45,8 @@ local specWarnGTFO = mod:NewSpecialWarningGTFO(1215421, nil, nil, nil, 1, 8)
local warnPlague = mod:NewTargetAnnounce(22997, 2)
local warnCauseInsanity = mod:NewTargetNoFilterAnnounce(26079, 2)
local warnExplosion = mod:NewAnnounce("WarnExplosion", 3, nil, false)
local warnAdd1 = mod:NewSpellAnnounce(17430)
local warnAdd2 = mod:NewSpellAnnounce(17431)

local specWarnPlague = mod:NewSpecialWarningMoveAway(22997, nil, nil, nil, 1, 2)
local specWarnBurst = mod:NewSpecialWarningDodge(1215202, nil, nil, nil, 2, 2)
Expand Down Expand Up @@ -84,7 +88,7 @@ function mod:SPELL_AURA_APPLIED(args)
elseif args:IsSpell(1215202) then
aq40Trash:NoxiousBurst(args, specWarnBurst, yellBurst, timerBurst)
elseif args:IsSpell(1215421) and args:IsPlayer() and self:AntiSpam(4, "ToxicPool") then
specWarnGTFO:Show()
specWarnGTFO:Show(args.spellName)
specWarnGTFO:Play("watchfeet")
elseif args:IsSpell(2855) and not args:IsDestTypePlayer() then
local caster = DBM:GetRaidUnitIdByGuid(args.sourceGUID)
Expand All @@ -95,13 +99,23 @@ function mod:SPELL_AURA_APPLIED(args)
end
end

function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId)
function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId, spellName)
if spellId == 1215421 and destGUID == UnitGUID("player") and self:AntiSpam(4, "ToxicPool") then
specWarnGTFO:Show()
specWarnGTFO:Show(spellName)
specWarnGTFO:Play("watchfeet")
end
end

function mod:SPELL_DAMAGE(sourceGUID, sourceName, _, sourceRaidFlags, _, _, _, _, spellId)
if spellId == 14297 then
aq40Trash:TrackTrashAbility(sourceGUID, "ShadowStorm", sourceRaidFlags, sourceName)
elseif spellId == 24340 then
aq40Trash:TrackTrashAbility(sourceGUID, "Meteor", sourceRaidFlags, sourceName)
elseif spellId == 8732 then
aq40Trash:TrackTrashAbility(sourceGUID, "Thunderclap", sourceRaidFlags, sourceName)
end
end

function mod:SPELL_AURA_REMOVED(args)
if args:IsSpell(22997) then
if args:IsPlayer() and self.Options.RangeFrame then
Expand All @@ -112,7 +126,7 @@ end

function mod:SPELL_CAST_SUCCESS(args)
-- 26586 (Birth) is used by a lot, here it indicates that Eye Tentacles (ghosts that don't look like Eye Tentacles at all) spawned that explode if they walk into you
if args:IsSpell(26586) and DBM:GetCIDFromGUID(args.sourceGUID) == 235668 or DBM:GetCIDFromGUID(args.sourceGUID) == 235528 and self:AntiSpam(5, "EyeTentacleExplosion") then
if args:IsSpell(26586) and (DBM:GetCIDFromGUID(args.sourceGUID) == 235668 or DBM:GetCIDFromGUID(args.sourceGUID) == 235528) then
aq40Trash:ExplodingGhost(warnExplosion, specWarnExplosion, timerExplosion)
end
end
Expand All @@ -136,6 +150,16 @@ function mod:SPELL_MISSED(sourceGUID, _, _, _, destGUID, destName, _, destRaidFl
end
end

function mod:SPELL_SUMMON(args)
if args:IsSpell(17430) then
warnAdd1:Show()
aq40Trash:TrackTrashAbility(args.sourceGUID, "Summon1", args.sourceRaidFlags, args.sourceName)
elseif args:IsSpell(17431) then
warnAdd2:Show()
aq40Trash:TrackTrashAbility(args.sourceGUID, "Summon2", args.sourceRaidFlags, args.sourceName)
end
end

function mod:PLAYER_TARGET_CHANGED()
aq40Trash:ScanTrashAbilities("target")
end
Expand Down
26 changes: 21 additions & 5 deletions DBM-Raids-Vanilla/AQ40/AQ40Trash.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ mod:RegisterEvents(
"SPELL_CAST_SUCCESS 26586",
"SPELL_DAMAGE 26555 26558 26554",
"SPELL_PERIODIC_DAMAGE 1215421",
"SPELL_SUMMON 17430 17431",
"SPELL_MISSED", -- Unfiltered to catch Reflect from Trash
"UNIT_DIED",
"PLAYER_TARGET_CHANGED",
Expand All @@ -43,6 +44,9 @@ local specWarnGTFO = mod:NewSpecialWarningGTFO(1215421, nil, nil, nil, 1, 8)
local warnPlague = mod:NewTargetNoFilterAnnounce(26556, 2)
local warnCauseInsanity = mod:NewTargetNoFilterAnnounce(26079, 2)
local warnExplosion = mod:NewAnnounce("WarnExplosion", 3, nil, false)
-- Not sure if both can happen in AQ40
local warnAdd1 = mod:NewSpellAnnounce(17430)
local warnAdd2 = mod:NewSpellAnnounce(17431)

local specWarnExplosion = mod:NewSpecialWarning("SpecWarnExplosion", nil, nil, nil, 1, 8)
-- Anubisath Reflect - keep in sync - AQ40/AQ40Trash.lua AQ20/AQ20Trash.lua
Expand Down Expand Up @@ -80,7 +84,9 @@ local trashAbilitiesLocalized = {
Mending = DBM:GetSpellName(2147),
KnockAway = DBM:GetSpellName(18670),
Thorns = DBM:GetSpellName(22351),
Plague = DBM:GetSpellName(26556)
Plague = DBM:GetSpellName(26556),
Summon1 = DBM:GetSpellName(17430),
Summon2 = DBM:GetSpellName(17431),
}

-- aura applied didn't seem to catch the reflects and other buffs
Expand Down Expand Up @@ -108,7 +114,7 @@ function mod:SPELL_AURA_APPLIED(args)
elseif args:IsSpell(1215202) then
self:NoxiousBurst(args, specWarnBurst, yellBurst, timerBurst)
elseif args:IsSpell(1215421) and args:IsPlayer() and self:AntiSpam(4, "ToxicPool") then
specWarnGTFO:Show()
specWarnGTFO:Show(args.spellName)
specWarnGTFO:Play("watchfeet")
elseif args:IsSpell(24573) and args:IsDestTypePlayer() then
self:TrackTrashAbility(args.sourceGUID, "MortalStrike", args.sourceRaidFlags, args.sourceName)
Expand All @@ -123,7 +129,7 @@ end

function mod:SPELL_CAST_SUCCESS(args)
-- 26586 (Birth) is used by a lot, here it indicates that Eye Tentacles (ghosts that don't look like Eye Tentacles at all) spawned that explode if they walk into you
if args:IsSpell(26586) and DBM:GetCIDFromGUID(args.sourceGUID) == 235668 or DBM:GetCIDFromGUID(args.sourceGUID) == 235528 and self:AntiSpam(5, "EyeTentacleExplosion") then
if args:IsSpell(26586) and (DBM:GetCIDFromGUID(args.sourceGUID) == 235668 or DBM:GetCIDFromGUID(args.sourceGUID) == 235528) then
self:ExplodingGhost(warnExplosion, specWarnExplosion, timerExplosion)
end
end
Expand Down Expand Up @@ -169,9 +175,9 @@ function mod:SPELL_MISSED(sourceGUID, _, _, _, destGUID, destName, _, destRaidFl
end
end

function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId)
function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId, spellName)
if spellId == 1215421 and destGUID == UnitGUID("player") and self:AntiSpam(4, "ToxicPool") then
specWarnGTFO:Show()
specWarnGTFO:Show(spellName)
specWarnGTFO:Play("watchfeet")
end
end
Expand Down Expand Up @@ -269,6 +275,16 @@ do
end
end

function mod:SPELL_SUMMON(args)
if args:IsSpell(17430) then
warnAdd1:Show()
self:TrackTrashAbility(args.sourceGUID, "Summon1", args.sourceRaidFlags, args.sourceName)
elseif args:IsSpell(17431) then
warnAdd2:Show()
self:TrackTrashAbility(args.sourceGUID, "Summon2", args.sourceRaidFlags, args.sourceName)
end
end

function mod:PLAYER_TARGET_CHANGED()
self:ScanTrashAbilities("target")
end
Expand Down
17 changes: 17 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,23 @@
## LoadOnDemand: 1
## X-DBM-Test: true

# AQ20
Season of Discovery/AQ20/Kurinaxx-Hardmode.lua
Season of Discovery/AQ20/Rajaxx-Hardmode.lua
Season of Discovery/AQ20/Moam-Hardmode.lua
Season of Discovery/AQ20/Buru-Hardmode.lua
Season of Discovery/AQ20/Ayamiss-Hardmode.lua
Season of Discovery/AQ20/Ossirian-Hardmode.lua
Season of Discovery/AQ20/Trash.lua

Season of Discovery/AQ20/Reports/Kurinaxx-Hardmode.lua
Season of Discovery/AQ20/Reports/Rajaxx-Hardmode.lua
Season of Discovery/AQ20/Reports/Moam-Hardmode.lua
Season of Discovery/AQ20/Reports/Buru-Hardmode.lua
Season of Discovery/AQ20/Reports/Ayamiss-Hardmode.lua
Season of Discovery/AQ20/Reports/Ossirian-Hardmode.lua
Season of Discovery/AQ20/Reports/Trash.lua

# World Bosses
Season of Discovery/World Bosses/Ysondre.lua

Expand Down
Loading
Loading