Skip to content

Update ailment hit calc to account for lucky dmg #572

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

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −6
Draft

Update ailment hit calc to account for lucky dmg #572

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
14 changes: 8 additions & 6 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3920,25 +3920,29 @@ function calcs.offence(env, actor, activeSkill)
-- Calculates damage to be used in damaging ailment calculations
local function calcAilmentSourceDamage(ailment, defaultDamageTypes)
local canCrit = not skillModList:Flag(cfg, "AilmentsAreNeverFromCrit")
local hitMin, hitMax = 0, 0
local critMin, critMax = 0, 0
local hitAvg, hitMin, hitMax = 0, 0, 0
local critAvg, critMin, critMax = 0, 0, 0
for _, damageType in ipairs(dmgTypeList) do
if canDoAilment(ailment, damageType, defaultDamageTypes) then
local override = skillModList:Override(cfg, ailment .. damageType .. "HitDamage")
local ailmentHitAvg = override or output[damageType.."StoredHitAvg"] or 0
local ailmentHitMin = override or output[damageType.."StoredHitMin"] or 0
local ailmentHitMax = override or output[damageType.."StoredHitMax"] or 0
hitAvg = hitAvg + ailmentHitAvg
hitMin = hitMin + ailmentHitMin
hitMax = hitMax + ailmentHitMax
output[ailment .. damageType .. "Avg"] = ailmentHitAvg
output[ailment .. damageType .. "Min"] = ailmentHitMin
output[ailment .. damageType .. "Max"] = ailmentHitMax
if canCrit then
override = skillModList:Override(cfg, ailment .. damageType .. "CritDamage")
critAvg = critAvg + (override or output[damageType.."StoredCritAvg"] or 0)
critMin = critMin + (override or output[damageType.."StoredCritMin"] or 0)
critMax = critMax + (override or output[damageType.."StoredCritMax"] or 0)
end
end
end
return hitMin, hitMax, critMin, critMax
return hitAvg, hitMin, hitMax, critAvg, critMin, critMax
end

-- Calculate the inflict chance and base damage of a secondary effect (bleed/poison/ignite/shock/freeze)
Expand Down Expand Up @@ -4155,9 +4159,7 @@ function calcs.offence(env, actor, activeSkill)
end
end

local hitMin, hitMax, critMin, critMax = calcAilmentSourceDamage(ailment, defaultDamageTypes)
local hitAvg = hitMin + ((hitMax - hitMin) * ailmentRollAverage / 100)
local critAvg = critMin + ((critMax - critMin) * ailmentRollAverage / 100)
local hitAvg, hitMin, hitMax, critAvg, critMin, critMax = calcAilmentSourceDamage(ailment, defaultDamageTypes)
if globalBreakdown then
globalBreakdown[ailment .. "DPS"] = {
s_format("Non-Crit Dmg Derivation:"),
Expand Down