Skip to content

Fix Toad's Price affecting non-utility flasks #10213

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

Fix Toad's Price affecting non-utility flasks #10213

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 @@ -1684,6 +1684,9 @@ function calcs.perform(env, skipEHP)
local effectMod = 1 + (flaskEffectInc) / 100
local effectModNonPlayer = 1 + (flaskEffectIncNonPlayer) / 100

-- Life and Mana flasks are not Utility flasks, so their effects are kept when Utility flasks are disabled
local isUtilityFlask = not (item.base.flask.life or item.base.flask.mana)

-- Avert thine eyes, lest they be forever scarred
-- I have no idea how to determine which buff is applied by a given flask,
-- so utility flasks are grouped by base, unique flasks are grouped by name, and magic flasks by their modifiers
Expand All @@ -1693,6 +1696,9 @@ function calcs.perform(env, skipEHP)
srcList:ScaleAddList(buffModList, effectMod)
mergeBuff(srcList, flaskBuffs, baseName)
mergeBuff(srcList, flaskBuffsPerBase[item.baseName], baseName)
if not isUtilityFlask then
mergeBuff(srcList, flaskBuffsNonUtility, baseName)
end
end
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC")) then
srcList = new("ModList"):ModList()
Expand All @@ -1717,7 +1723,9 @@ function calcs.perform(env, skipEHP)
if not onlyRecovery then
mergeBuff(srcList, flaskBuffs, key)
mergeBuff(srcList, flaskBuffsPerBase[item.baseName], key)
mergeBuff(srcList, flaskBuffsNonUtility, key)
if not isUtilityFlask then
mergeBuff(srcList, flaskBuffsNonUtility, key)
end
end
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC")) then
srcList = new("ModList"):ModList()
Expand Down
Loading