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

Classic/ZulFarrak: Fix encounter detection in Cataclysm Classic #1229

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Classic/ZulFarrak: Fix encounter detection in Cataclysm Classic #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Classic/ZulFarrak/Antusul.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function mod:OnBossEnable()
self:Log("SPELL_CAST_START", "HealingWaveOfAntusul", 11895)
self:Log("SPELL_CAST_SUCCESS", "AntusulsMinion", 11894)
self:Log("SPELL_AURA_APPLIED", "PetrifyApplied", 11020)
if self:Heroic() then -- no encounter events in Timewalking
if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Death("Win", 8127)
end
Expand Down
2 changes: 1 addition & 1 deletion Classic/ZulFarrak/ChiefUkorzSandscalp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function mod:OnBossEnable()
if self:Retail() then
self:Log("SPELL_AURA_APPLIED", "EnrageApplied", 454632)
end
if self:Heroic() then -- no encounter events in Timewalking
if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Death("Win", 7267)
end
Expand Down
2 changes: 1 addition & 1 deletion Classic/ZulFarrak/Gahzrilla.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function mod:OnBossEnable()
self:Log("SPELL_AURA_APPLIED", "FreezeSolidApplied", 11836)
self:Log("SPELL_CAST_START", "GahzrillaSlam", 11902)
self:Log("SPELL_CAST_SUCCESS", "GahzrillaSlamSuccess", 11902)
if self:Heroic() then -- no encounter events in Timewalking
if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Death("Win", 7273)
end
Expand Down
4 changes: 2 additions & 2 deletions Classic/ZulFarrak/NekrumAndSezzziz.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function mod:OnBossEnable()
self:Log("SPELL_INTERRUPT", "HealInterrupt", 12039)
self:Log("SPELL_CAST_SUCCESS", "HealSuccess", 12039)

if self:Heroic() then -- no encounter events in Timewalking
if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
end
self:Death("BossDeath", 7796, 7275)
Expand Down Expand Up @@ -123,7 +123,7 @@ end

function mod:BossDeath(args)
deaths = deaths + 1
if self:Heroic() and deaths == 2 then -- no encounter events in Timewalking
if (self:Heroic() or (self:Classic() and not self:Vanilla())) and deaths == 2 then -- no encounter events in Timewalking
deaths = 0
self:Win()
elseif args.mobId == 7796 then -- Nekrum Gutchewer
Expand Down
8 changes: 4 additions & 4 deletions Classic/ZulFarrak/Theka.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ function mod:OnBossEnable()
self:Log("SPELL_AURA_APPLIED", "ShadowWordPainApplied", 15654)
self:Log("SPELL_CAST_SUCCESS", "CurseOfTheMartyr", 450933)
self:Log("SPELL_AURA_APPLIED", "CurseOfTheMartyrApplied", 450933)
if self:Heroic() then -- no encounter events in Timewalking
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Death("Win", 7272)
end
end
if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Death("Win", 7272)
end
end

Expand Down
2 changes: 1 addition & 1 deletion Classic/ZulFarrak/Velratha.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function mod:OnBossEnable()
self:Log("SPELL_INTERRUPT", "HealingWaveInterrupt", 15982)
self:Log("SPELL_CAST_SUCCESS", "HealingWaveSuccess", 15982)
self:Log("SPELL_CAST_START", "CrashingWave", 78802)
if self:Heroic() then -- no encounter events in Timewalking
if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Death("Win", 7795)
end
Expand Down
2 changes: 1 addition & 1 deletion Classic/ZulFarrak/Zumrah.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function mod:OnBossEnable()
self:Log("SPELL_INTERRUPT", "HealingWaveInterrupt", 15982)
self:Log("SPELL_CAST_SUCCESS", "HealingWaveSuccess", 15982)
self:Log("SPELL_CAST_START", "ShadowBoltVolley", 17228)
if self:Heroic() then -- no encounter events in Timewalking
if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
self:Death("Win", 7271)
end
Expand Down