Skip to content

Fix for Chieftain resist nodes applying effects twice due to Foulborn Choir of the Storm #9643

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
EminGul wants to merge 1 commit into
base: dev
Choose a base branch
from
+37 −34
Open

Fix for Chieftain resist nodes applying effects twice due to Foulborn Choir of the Storm #9643

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
71 changes: 37 additions & 34 deletions src/Modules/CalcDefence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,47 +513,50 @@ function calcs.resistances(actor)
output["PhysicalResist"] = 0

-- Process Resistance conversion mods
for _, resFrom in ipairs(resistTypeList) do
local maxRes
for _, resTo in ipairs(resistTypeList) do
local conversionRate = modDB:Sum("BASE", nil, resFrom.."MaxResConvertTo"..resTo) / 100
if conversionRate ~= 0 then
if not maxRes then
maxRes = 0
for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."ResistMax")) do
if mod.mod.source ~= "Base" then
maxRes = maxRes + mod.value
if not actor.resistConversionApplied then
actor.resistConversionApplied = true
for _, resFrom in ipairs(resistTypeList) do
local maxRes
for _, resTo in ipairs(resistTypeList) do
local conversionRate = modDB:Sum("BASE", nil, resFrom.."MaxResConvertTo"..resTo) / 100
if conversionRate ~= 0 then
if not maxRes then
maxRes = 0
for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."ResistMax")) do
if mod.mod.source ~= "Base" then
maxRes = maxRes + mod.value
end
end
end
end
if maxRes ~= 0 then
modDB:NewMod(resTo.."ResistMax", "BASE", maxRes * conversionRate, resFrom.." To "..resTo.." Max Resistance Conversion")
if maxRes ~= 0 then
modDB:NewMod(resTo.."ResistMax", "BASE", maxRes * conversionRate, resFrom.." To "..resTo.." Max Resistance Conversion")
end
end
end
end
end

for _, resFrom in ipairs(resistTypeList) do
local res
for _, resTo in ipairs(resistTypeList) do
local conversionRate = modDB:Sum("BASE", nil, resFrom.."ResConvertTo"..resTo) / 100
if conversionRate ~= 0 then
if not res then
res = 0
for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."Resist")) do
if mod.mod.source ~= "Base" then
res = res + mod.value

for _, resFrom in ipairs(resistTypeList) do
local res
for _, resTo in ipairs(resistTypeList) do
local conversionRate = modDB:Sum("BASE", nil, resFrom.."ResConvertTo"..resTo) / 100
if conversionRate ~= 0 then
if not res then
res = 0
for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."Resist")) do
if mod.mod.source ~= "Base" then
res = res + mod.value
end
end
end
end
if res ~= 0 then
modDB:NewMod(resTo.."Resist", "BASE", res * conversionRate, resFrom.." To "..resTo.." Resistance Conversion")
end
for _, mod in ipairs(modDB:Tabulate("INC", nil, resFrom.."Resist")) do
modDB:NewMod(resTo.."Resist", "INC", mod.value * conversionRate, mod.mod.source)
end
for _, mod in ipairs(modDB:Tabulate("MORE", nil, resFrom.."Resist")) do
modDB:NewMod(resTo.."Resist", "MORE", mod.value * conversionRate, mod.mod.source)
if res ~= 0 then
modDB:NewMod(resTo.."Resist", "BASE", res * conversionRate, resFrom.." To "..resTo.." Resistance Conversion")
end
for _, mod in ipairs(modDB:Tabulate("INC", nil, resFrom.."Resist")) do
modDB:NewMod(resTo.."Resist", "INC", mod.value * conversionRate, mod.mod.source)
end
for _, mod in ipairs(modDB:Tabulate("MORE", nil, resFrom.."Resist")) do
modDB:NewMod(resTo.."Resist", "MORE", mod.value * conversionRate, mod.mod.source)
end
end
end
end
Expand Down
Loading