diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index 9fe4527156..b40ae95e62 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -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 @@ -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 diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua index c258394668..bc5c01edc7 100644 --- a/src/Modules/ConfigOptions.lua +++ b/src/Modules/ConfigOptions.lua @@ -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 },