Skip to content

Fix Poisonous Concoction Added Damage from Disabled Life Flasks #9339

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

Merged
LocalIdentity merged 5 commits into from
Apr 16, 2026
+4 −4
Merged

Fix Poisonous Concoction Added Damage from Disabled Life Flasks #9339

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b09e3d
set LifeFlaskRecovery for PConc if life flask is in a disabled slot
Peechey Nov 23, 2025
78d79d3
update for multiple disabled life flasks and refactor into function
Peechey Nov 23, 2025
199495f
Merge branch 'dev' into fix/disabled-life-flask-and-pconc
Peechey Apr 16, 2026
d6c371f
indent fix
Peechey Apr 16, 2026
6752419
Simplify code
Apr 16, 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
8 changes: 4 additions & 4 deletions src/Modules/CalcSetup.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,10 @@ function calcs.initEnv(build, mode, override, specEnv)
end
end
end
if item and item.type == "Flask" and item.base.subType == "Life" and item.flaskData then
-- Keep highest life flask recovery even if this slot is later disabled (e.g. Poisonous Concoction).
env.itemModDB.multipliers["LifeFlaskRecovery"] = m_max(env.itemModDB.multipliers["LifeFlaskRecovery"] or 0, item.flaskData.lifeTotal or 0)
end
items[slotName] = item
::continue::
end
Expand Down Expand Up @@ -912,11 +916,7 @@ function calcs.initEnv(build, mode, override, specEnv)
env.flaskSlotOccupied[flaskNum] = true
end
if item.base.subType == "Life" then
local highestLifeRecovery = env.itemModDB.multipliers["LifeFlaskRecovery"] or 0
local highestCharges = env.itemModDB.multipliers["LifeFlaskCharges"] or 0
if item.flaskData.lifeTotal > highestLifeRecovery then
env.itemModDB.multipliers["LifeFlaskRecovery"] = item.flaskData.lifeTotal
end
if item.flaskData.chargesMax > highestCharges then
env.itemModDB.multipliers["LifeFlaskCharges"] = item.flaskData.chargesMax
end
Expand Down
Loading