Skip to content

Fix Relic Flask's combining effect with unique flask of the same name #8610

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 1 commit into from
Jun 6, 2025
Merged

Fix Relic Flask's combining effect with unique flask of the same name #8610

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
8 changes: 4 additions & 4 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@ function calcs.perform(env, skipEHP)
mergeBuff(srcList, flaskBuffs, baseName)
mergeBuff(srcList, flaskBuffsPerBase[item.baseName], baseName)
end
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE")) then
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC")) then
srcList = new("ModList")
srcList:ScaleAddList(buffModList, effectModNonPlayer)
mergeBuff(srcList, flaskBuffsNonPlayer, baseName)
Expand All @@ -1410,7 +1410,7 @@ function calcs.perform(env, skipEHP)
local srcList = new("ModList")
srcList:ScaleAddList(modList, effectMod)
local key
if item.rarity == "UNIQUE" then
if item.rarity == "UNIQUE" or item.rarity == "RELIC" then
key = item.title
else
key = ""
Expand All @@ -1422,7 +1422,7 @@ function calcs.perform(env, skipEHP)
mergeBuff(srcList, flaskBuffs, key)
mergeBuff(srcList, flaskBuffsPerBase[item.baseName], key)
end
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE")) then
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC")) then
srcList = new("ModList")
srcList:ScaleAddList(modList, effectModNonPlayer)
mergeBuff(srcList, flaskBuffsNonPlayer, key)
Expand Down Expand Up @@ -1522,7 +1522,7 @@ function calcs.perform(env, skipEHP)
local srcList = new("ModList")
srcList:ScaleAddList(modList, effectMod)
local key
if item.rarity == "UNIQUE" then
if item.rarity == "UNIQUE" or item.rarity == "RELIC" then
key = item.title
else
key = ""
Expand Down