From 9a714e5001044d89923c4d28bff922c9556b530d Mon Sep 17 00:00:00 2001 From: Lilylicious Date: Tue, 8 Aug 2023 14:46:29 +0200 Subject: [PATCH] Use highest max shock from any active skill, not from main skill --- src/Modules/CalcPerform.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index 22e7e16738..15e9c5fe0e 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -2843,7 +2843,14 @@ function calcs.perform(env, avoidCache, fullDPSSkipEHP) end override = m_max(override, effect or 0) end - output["Maximum"..ailment] = modDB:Override(nil, ailment.."Max") or (ailmentData[ailment].max + env.player.mainSkill.baseSkillModList:Sum("BASE", nil, ailment.."Max")) + local maxAilment = modDB:Override(nil, ailment.."Max") or 0 + if not modDB:Override(nil, ailment.."Max") then + for _, skill in ipairs(env.player.activeSkillList) do + local skillMax = modDB:Override(nil, ailment.."Max") or (ailmentData[ailment].max + skill.baseSkillModList:Sum("BASE", nil, ailment.."Max")) + maxAilment = skillMax > maxAilment and skillMax or maxAilment + end + end + output["Maximum"..ailment] = maxAilment output["Current"..ailment] = m_floor(m_min(m_max(override, enemyDB:Sum("BASE", nil, ailment.."Val")), output["Maximum"..ailment]) * (10 ^ ailmentData[ailment].precision)) / (10 ^ ailmentData[ailment].precision) for _, mod in ipairs(val.mods(output["Current"..ailment])) do enemyDB:AddMod(mod)