Skip to content

Fix max charge override being set during charge pre-pass #9442

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
Paliak wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fix max charge override being set during charge pre-pass #9442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f9de51
FIX: Charge max override being set during charge pre-pass
Paliak Jan 30, 2026
376a585
CHORE: add test
Paliak Jan 30, 2026
0c9d6ac
FIX: duplicate function end in test
Paliak Jan 30, 2026
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
27 changes: 27 additions & 0 deletions spec/System/TestItemMods_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,4 +585,31 @@ describe("TetsItemMods", function()

assert.are.equals(0.86, build.calcsTab.calcsOutput.LightningEffMult)
end)

it("Max charges with conditional mod", function() -- see #9442
build.skillsTab:PasteSocketGroup("Grace 20/20 Default 1\n")
runCallback("OnFrame")

local baseFrenzyChargesMax = build.calcsTab.calcsOutput.FrenzyChargesMax
local baseEnduranceChargesMax = build.calcsTab.calcsOutput.EnduranceChargesMax

build.configTab.input.customMods = [[
+1 to Maximum Frenzy Charges while affected by Grace
]]
build.configTab:BuildModList()
runCallback("OnFrame")

assert.are.equals(baseFrenzyChargesMax + 1, build.calcsTab.calcsOutput.FrenzyChargesMax)
assert.are.equals(baseEnduranceChargesMax, build.calcsTab.calcsOutput.EnduranceChargesMax)

build.configTab.input.customMods = [[
Your Maximum Endurance Charges is equal to your Maximum Frenzy Charges
+1 to Maximum Frenzy Charges while affected by Grace
]]
build.configTab:BuildModList()
runCallback("OnFrame")

assert.are.equals(baseFrenzyChargesMax + 1, build.calcsTab.calcsOutput.FrenzyChargesMax)
assert.are.equals(baseEnduranceChargesMax + 1, build.calcsTab.calcsOutput.EnduranceChargesMax)
end)
end)
8 changes: 2 additions & 6 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,18 +897,14 @@ local function doActorCharges(env, actor)
output.PowerChargesDuration = m_floor(modDB:Sum("BASE", nil, "ChargeDuration") * calcLib.mod(modDB, nil, "PowerChargesDuration", "ChargeDuration"))
if modDB:Flag(nil, "MaximumFrenzyChargesIsMaximumPowerCharges") then
local source = modDB.mods["MaximumFrenzyChargesIsMaximumPowerCharges"][1].source
if not modDB:HasMod("OVERRIDE", {source = source:match("[^:]+")}, "FrenzyChargesMax") then
modDB:NewMod("FrenzyChargesMax", "OVERRIDE", output.PowerChargesMax, source)
end
modDB:ReplaceMod("FrenzyChargesMax", "OVERRIDE", output.PowerChargesMax, source)
end
output.FrenzyChargesMin = m_max(modDB:Sum("BASE", nil, "FrenzyChargesMin"), 0)
output.FrenzyChargesMax = modDB:Override(nil, "FrenzyChargesMax") or m_max(modDB:Flag(nil, "MaximumFrenzyChargesIsMaximumPowerCharges") and output.PowerChargesMax or modDB:Sum("BASE", nil, "FrenzyChargesMax"), 0)
output.FrenzyChargesDuration = m_floor(modDB:Sum("BASE", nil, "ChargeDuration") * calcLib.mod(modDB, nil, "FrenzyChargesDuration", "ChargeDuration"))
if modDB:Flag(nil, "MaximumEnduranceChargesIsMaximumFrenzyCharges") then
local source = modDB.mods["MaximumEnduranceChargesIsMaximumFrenzyCharges"][1].source
if not modDB:HasMod("OVERRIDE", {source = source:match("[^:]+")}, "EnduranceChargesMax") then
modDB:NewMod("EnduranceChargesMax", "OVERRIDE", output.FrenzyChargesMax, source)
end
modDB:ReplaceMod("EnduranceChargesMax", "OVERRIDE", output.FrenzyChargesMax, source)
end
output.EnduranceChargesMin = m_max(modDB:Sum("BASE", nil, "EnduranceChargesMin"), 0)
output.EnduranceChargesMax = modDB:Override(nil, "EnduranceChargesMax") or m_max(env.partyMembers.modDB:Flag(nil, "PartyMemberMaximumEnduranceChargesEqualToYours") and env.partyMembers.output.EnduranceChargesMax or (modDB:Flag(nil, "MaximumEnduranceChargesIsMaximumFrenzyCharges") and output.FrenzyChargesMax or modDB:Sum("BASE", nil, "EnduranceChargesMax")), 0)
Expand Down