Skip to content

Fix Tinctures applying their effects even when you have no Mana #9769

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

Fix Tinctures applying their effects even when you have no Mana #9769

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
10 changes: 9 additions & 1 deletion src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,11 @@ function calcs.perform(env, skipEHP)


local function mergeTinctures(tinctures)
local tincturesNotInflictManaBurn = m_min(modDB:Sum("BASE", nil, "TincturesNotInflictManaBurn"), 100)
local canGainRequiredBurn = modDB:Flag(nil, "Condition:WeepingWoundsInsteadOfManaBurn") or (tincturesNotInflictManaBurn < 100 and (output.ManaUnreserved or 0) > 0)
if not canGainRequiredBurn then
return
end
local tinctureBuffs = { }
local tinctureConditions = {}
local tinctureBuffsPerBase = {}
Expand Down Expand Up @@ -1773,7 +1778,6 @@ function calcs.perform(env, skipEHP)
-- This needs to be done in 2 steps to account for effects affecting life recovery from flasks
-- For example Sorrow of the Divine and buffs (like flask recovery watchers eye)
mergeFlasks(env.flasks, false, true)
mergeTinctures(env.tinctures)

-- Merge keystones again to catch any that were added by flasks
modLib.mergeKeystones(env, env.modDB)
Expand Down Expand Up @@ -1921,6 +1925,10 @@ function calcs.perform(env, skipEHP)
-- Set the life/mana reservations (hold off on GrantReserved"..pool.."AsAura)
doActorLifeManaReservation(env.player, not modDB:Flag(nil, "ManaIncreasedByOvercappedLightningRes"))

if env.mode_combat then
mergeTinctures(env.tinctures)
end

-- Process attribute requirements
do
local reqMult = calcLib.mod(modDB, nil, "GlobalAttributeRequirements")
Expand Down
Loading