Skip to content

Fix an interaction between Rakiatas Flow and sources of "ignore non-negative elemental resistances" #2373

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

Open
emptywalls wants to merge 1 commit into
base: dev
Choose a base branch
from
+4 −2
Open

Fix an interaction between Rakiatas Flow and sources of "ignore non-negative elemental resistances" #2373

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
6 changes: 4 additions & 2 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4093,6 +4093,7 @@ function calcs.offence(env, actor, activeSkill)
if (damageTypeHitMin ~= 0 or damageTypeHitMax ~= 0) and env.mode_effective then
-- Apply enemy resistances and damage taken modifiers
local resist = 0
local resistBeforeIgnoreNonNegative = 0
local pen = 0
local minPen = 0
local sourceRes = damageType
Expand Down Expand Up @@ -4165,6 +4166,7 @@ function calcs.offence(env, actor, activeSkill)
end
sourceRes = elementUsed
elseif isElemental[damageType] then
resistBeforeIgnoreNonNegative = resist
if resist > 0 and modDB:Flag(cfg, "IgnoreNonNegativeEleRes") then
resist = 0
end
Expand Down Expand Up @@ -4194,11 +4196,11 @@ function calcs.offence(env, actor, activeSkill)
return resist > minPen and m_max(resist - pen, minPen) or resist
end
if skillModList:Flag(cfg, isElemental[damageType] and "CannotElePenIgnore" or nil) then
effectiveResist = (isElemental[damageType] and invertChance > 0) and (resist - 2 * invertChance * resist) or resist
effectiveResist = (isElemental[damageType] and invertChance > 0) and (resistBeforeIgnoreNonNegative - 2 * invertChance * resistBeforeIgnoreNonNegative) or resist
effMult = effMult * (1 - effectiveResist / 100)
elseif useRes then
if isElemental[damageType] and invertChance > 0 then
effectiveResist = calcPenResist(resist) * (1 - invertChance) + calcPenResist(-resist) * invertChance
effectiveResist = calcPenResist(resist) * (1 - invertChance) + calcPenResist(-resistBeforeIgnoreNonNegative) * invertChance
else
effectiveResist = calcPenResist(resist)
end
Expand Down