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

Fix error when comparing bows with Mirage Archer for Ignite/Bleed #2629

Merged
merged 2 commits into from
Apr 22, 2021
Merged

Fix error when comparing bows with Mirage Archer for Ignite/Bleed #2629

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d68b3
Fix error when comparing bows with Mirage Archer for Ignite/Bleed
Nostrademous Apr 20, 2021
8b07db4
condition fix
Nostrademous Apr 21, 2021
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: 3 additions & 3 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3985,11 +3985,11 @@ function calcs.offence(env, actor, activeSkill)
output.MirageDPS = activeSkill.mirage.output.TotalDPS * mirageCount
output.CombinedDPS = output.CombinedDPS + activeSkill.mirage.output.TotalDPS * mirageCount

if activeSkill.mirage.output.IgniteDPS and activeSkill.mirage.output.IgniteDPS > output.IgniteDPS then
if activeSkill.mirage.output.IgniteDPS and activeSkill.mirage.output.IgniteDPS > (output.IgniteDPS or 0) then
output.MirageDPS = output.MirageDPS + activeSkill.mirage.output.IgniteDPS
output.IgniteDPS = 0
end
if activeSkill.mirage.output.BleedDPS and activeSkill.mirage.output.BleedDPS > output.BleedDPS then
if activeSkill.mirage.output.BleedDPS and activeSkill.mirage.output.BleedDPS > (output.BleedDPS or 0) then
output.MirageDPS = output.MirageDPS + activeSkill.mirage.output.BleedDPS
output.BleedDPS = 0
end
Expand All @@ -4006,7 +4006,7 @@ function calcs.offence(env, actor, activeSkill)
output.MirageDPS = output.MirageDPS + activeSkill.mirage.output.DecayDPS
output.CombinedDPS = output.CombinedDPS + activeSkill.mirage.output.DecayDPS
end
if activeSkill.mirage.output.TotalDot and (skillFlags.DotCanStack or output.TotalDot == 0) then
if activeSkill.mirage.output.TotalDot and (skillFlags.DotCanStack or not output.TotalDot or output.TotalDot == 0) then
output.MirageDPS = output.MirageDPS + activeSkill.mirage.output.TotalDot * (skillFlags.DotCanStack and mirageCount or 1)
output.CombinedDPS = output.CombinedDPS + activeSkill.mirage.output.TotalDot * (skillFlags.DotCanStack and mirageCount or 1)
end
Expand Down