Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions src/Modules/CalcPerform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,6 @@ local function doActorCharges(env, actor)
output.RemovableFrenzyCharges = m_max(output.FrenzyCharges - output.FrenzyChargesMin, 0)
if modDB:Flag(nil, "UseEnduranceCharges") then
output.EnduranceCharges = modDB:Override(nil, "EnduranceCharges") or output.EnduranceChargesMax
if modDB:Flag(nil, "CanGainBrineCharges") then
output.BrineCharges = output.BrineChargesMax
end
end
if modDB:Flag(nil, "EnduranceChargesConvertToBrutalCharges") then
-- we max with possible Endurance Charge Override from Config since Brutal Charges won't have their own config entry
Expand All @@ -1096,6 +1093,9 @@ local function doActorCharges(env, actor)
output.EnduranceCharges = m_max(output.EnduranceCharges, m_min(output.EnduranceChargesMax, output.EnduranceChargesMin))
end
output.RemovableEnduranceCharges = m_max(output.EnduranceCharges - output.EnduranceChargesMin, 0)
if modDB:Flag(nil, "UseBrineCharges") and modDB:Flag(nil, "CanGainBrineCharges") and not modDB:Flag(nil, "EnduranceChargesConvertToBrutalCharges") then
output.BrineCharges = modDB:Override(nil, "BrineCharges") or output.BrineChargesMax
end
if modDB:Flag(nil, "UseSiphoningCharges") then
output.SiphoningCharges = modDB:Override(nil, "SiphoningCharges") or output.SiphoningChargesMax
end
Expand Down
6 changes: 6 additions & 0 deletions src/Modules/ConfigOptions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,12 @@ Huge sets the radius to 11.
{ var = "overrideEnduranceCharges", type = "count", label = "# of Endurance Charges (if not maximum):", ifOption = "useEnduranceCharges", apply = function(val, modList, enemyModList)
modList:NewMod("EnduranceCharges", "OVERRIDE", val, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "useBrineCharges", type = "check", label = "Do you use Brine Charges?", ifFlag = "CanGainBrineCharges", apply = function(val, modList, enemyModList)
modList:NewMod("UseBrineCharges", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "overrideBrineCharges", type = "count", label = "# of Brine Charges (if not maximum):", ifOption = "useBrineCharges", apply = function(val, modList, enemyModList)
modList:NewMod("BrineCharges", "OVERRIDE", val, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "useSiphoningCharges", type = "check", label = "Do you use Siphoning Charges?", ifMult = "SiphoningCharge", apply = function(val, modList, enemyModList)
modList:NewMod("UseSiphoningCharges", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
Expand Down
Loading