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

AQ40: Trash updates and new CThun test data #282

Merged
merged 3 commits into from
Dec 18, 2024
Merged

AQ40: Trash updates and new CThun test data #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e93e77c
C'Thun: Update test data
emmericp Dec 18, 2024
429636f
AQ Trash: Track some more spell IDs for trash abilities
emmericp Dec 18, 2024
098b15f
AQ Trash: Show trash HP in info frame
emmericp Dec 18, 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
10 changes: 6 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 @@ -28,7 +28,7 @@ mod:RegisterEvents(
"SPELL_SUMMON 17430 17431",
"SPELL_MISSED",
"UNIT_DIED",
"SPELL_DAMAGE 14297 24340 8732",
"SPELL_DAMAGE 14297 24340 8732 26546 26558 26554 25779",
"PLAYER_TARGET_CHANGED",
"NAME_PLATE_UNIT_ADDED"
)
Expand Down Expand Up @@ -107,12 +107,14 @@ function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId, spell
end

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

Expand Down
41 changes: 33 additions & 8 deletions DBM-Raids-Vanilla/AQ40/AQ40Trash.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ mod:RegisterEvents(
"ENCOUNTER_END",
"SPELL_AURA_APPLIED 26556 25698 26079 1215202 1215421 24573 2855",
"SPELL_AURA_REMOVED 26556",
"SPELL_CAST_SUCCESS 26586",
"SPELL_DAMAGE 26555 26558 26554",
"SPELL_CAST_SUCCESS 26586 26073",
"SPELL_CAST_START 26069 26070 26071 26072",
"SPELL_DAMAGE 26555 26558 26554 25779 26546 24340 8732",
"SPELL_PERIODIC_DAMAGE 1215421",
"SPELL_SUMMON 17430 17431",
"SPELL_MISSED", -- Unfiltered to catch Reflect from Trash
Expand Down Expand Up @@ -87,6 +88,12 @@ local trashAbilitiesLocalized = {
Plague = DBM:GetSpellName(26556),
Summon1 = DBM:GetSpellName(17430),
Summon2 = DBM:GetSpellName(17431),
ManaBurn = DBM:GetSpellName(25779),
Fear = DBM:GetSpellName(26070),
Roots = DBM:GetSpellName(26071),
DustCloud = DBM:GetSpellName(26072),
Silence = DBM:GetSpellName(26069),
FireNova = DBM:GetSpellName(26073),
}

-- aura applied didn't seem to catch the reflects and other buffs
Expand Down Expand Up @@ -131,6 +138,8 @@ 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) then
self:ExplodingGhost(warnExplosion, specWarnExplosion, timerExplosion)
elseif args:IsSpell(26073) then
self:TrackTrashAbility(args.sourceGUID, "FireNova", args.sourceRaidFlags, args.sourceName)
end
end

Expand All @@ -145,16 +154,18 @@ end
-- todo: thorns
local playerGUID = UnitGUID("player")
function mod:SPELL_DAMAGE(sourceGUID, sourceName, _, sourceRaidFlags, destGUID, _, _, _, spellId, spellName)
if spellId == 26555 then
if spellId == 26555 or spellId == 26546 then
if destGUID == playerGUID and self:AntiSpam(3, 3) then
specWarnShadowStorm:Show(sourceName)
specWarnShadowStorm:Play("findshelter")
end
self:TrackTrashAbility(sourceGUID, "ShadowStorm", sourceRaidFlags, sourceName)
elseif spellId == 26558 then
elseif spellId == 26558 or spellId == 24340 then
self:TrackTrashAbility(sourceGUID, "Meteor", sourceRaidFlags, sourceName)
elseif spellId == 26554 then
elseif spellId == 26554 or spellId == 8732 then
self:TrackTrashAbility(sourceGUID, "Thunderclap", sourceRaidFlags, sourceName)
elseif spellId == 25779 then
self:TrackTrashAbility(sourceGUID, "ManaBurn", sourceRaidFlags, sourceName)
end
end
function mod:SPELL_MISSED(sourceGUID, _, _, _, destGUID, destName, _, destRaidFlags, _, _, spellSchool, missType)
Expand Down Expand Up @@ -275,6 +286,18 @@ do
end
end

function mod:SPELL_CAST_START(args)
if args:IsSpell(26070) then
self:TrackTrashAbility(args.sourceGUID, "Fear", args.sourceRaidFlags, args.sourceName)
elseif args:IsSpell(26071) then
self:TrackTrashAbility(args.sourceGUID, "Roots", args.sourceRaidFlags, args.sourceName)
elseif args:IsSpell(26072) then
self:TrackTrashAbility(args.sourceGUID, "DustCloud", args.sourceRaidFlags, args.sourceName)
elseif args:IsSpell(26069) then
self:TrackTrashAbility(args.sourceGUID, "Silence", args.sourceRaidFlags, args.sourceName)
end
end

function mod:SPELL_SUMMON(args)
if args:IsSpell(17430) then
warnAdd1:Show()
Expand Down Expand Up @@ -439,16 +462,18 @@ local function updateInfoFrame()
end
table.wipe(lines)
table.wipe(sortedLines)
for k, mob in pairs(mobs) do
for guid, mob in pairs(mobs) do
local hp = DBM:GetBossHP(guid)
mob.hp = hp or mob.hp
local name = HIGHLIGHT_FONT_COLOR:WrapTextInColorCode(mob.name)
if mob.icon > 0 then
name = DBM:IconNumToTexture(mob.icon) .. " " .. name
end
addLine(name)
addLine(name, mob.hp and ("%d%%"):format(mob.hp))
for _, ability in ipairs(mob.sortedAbilities) do
addLine(NORMAL_FONT_COLOR:WrapTextInColorCode((" "):rep(6) .. ability))
end
if next(mobs, k) then
if next(mobs, guid) then
addLine(" ")
end
end
Expand Down
6 changes: 5 additions & 1 deletion DBM-Test-Vanilla/Season of Discovery/AQ20/Reports/Trash.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Findings:
Unused event registration: SPELL_CAST_SUCCESS 26586 (Birth)
Unused event registration: SPELL_DAMAGE 14297 (Shadow Storm)
Unused event registration: SPELL_DAMAGE 24340 (Meteor)
Unused event registration: SPELL_DAMAGE 25779 (Mana Burn)
Unused event registration: SPELL_DAMAGE 26546 (Shadow Storm)
Unused event registration: SPELL_DAMAGE 26554 (Thunderclap)
Unused event registration: SPELL_DAMAGE 26558 (Meteor)
Unused event registration: SPELL_DAMAGE 8732 (Thunderclap)
Unused event registration: SPELL_MISSED
Unused event registration: SPELL_PERIODIC_DAMAGE 1215421 (Toxic Pool)
Expand Down Expand Up @@ -64,7 +68,7 @@ Icons:

Event trace:
[ 0.00] ADDON_LOADED: DBM-Raids-Vanilla, 0
RegisterEvents: Regular, SPELL_AURA_APPLIED 22997 25698 26079 1215202 1215421 2855, 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
RegisterEvents: Regular, SPELL_AURA_APPLIED 22997 25698 26079 1215202 1215421 2855, 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 26546 26558 26554 25779, PLAYER_TARGET_CHANGED, NAME_PLATE_UNIT_ADDED
Unknown trigger
AntiSpam: NoxiousBurst
ShowSpecialWarning: Noxious Burst - dodge attack
Expand Down
Loading
Loading