Skip to content

Fix Sleight of Hand and other One Handed Weapon + Damage with Ailments passives #5923

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

Merged
merged 1 commit into from
Apr 22, 2023
Merged

Fix Sleight of Hand and other One Handed Weapon + Damage with Ailments passives #5923

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
10 changes: 10 additions & 0 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3190,6 +3190,13 @@ function calcs.offence(env, actor, activeSkill)
end
end

-- address Weapon1H interaction with Ailment for nodes like Sleight of Hand
-- bit-and on cfg.flags confirms if the skill has the 1H flag
-- if so bit-or on the targetCfg (e.g. dotCfg) to guarantee for calculations like Sum("INC") and breakdown
local function checkWeapon1HFlags(targetCfg)
targetCfg.flags = bor(targetCfg.flags, band(cfg.flags, ModFlag.Weapon1H))
end

---Calculates normal and crit damage to be used in non-damaging ailment calculations
---@param ailment string
---@return number, number @average hit damage, average crit damage
Expand Down Expand Up @@ -3303,6 +3310,7 @@ function calcs.offence(env, actor, activeSkill)
skillDist = skillCfg.skillDist,
}
local dotCfg = pass.label ~= "Off Hand" and activeSkill.bleedCfg or activeSkill.OHbleedCfg
checkWeapon1HFlags(dotCfg)
local sourceHitDmg, sourceCritDmg
if breakdown then
breakdown.BleedPhysical = { damageTypes = { } }
Expand Down Expand Up @@ -3499,6 +3507,7 @@ function calcs.offence(env, actor, activeSkill)
skillDist = skillCfg.skillDist,
}
local dotCfg = pass.label ~= "Off Hand" and activeSkill.poisonCfg or activeSkill.OHpoisonCfg
checkWeapon1HFlags(dotCfg)
local sourceHitDmg, sourceCritDmg
if breakdown then
breakdown.PoisonPhysical = { damageTypes = { } }
Expand Down Expand Up @@ -3724,6 +3733,7 @@ function calcs.offence(env, actor, activeSkill)
skillDist = skillCfg.skillDist,
}
local dotCfg = pass.label ~= "Off Hand" and activeSkill.igniteCfg or activeSkill.OHigniteCfg
checkWeapon1HFlags(dotCfg)
local sourceHitDmg, sourceCritDmg
if breakdown then
breakdown.IgnitePhysical = { damageTypes = { } }
Expand Down