Skip to content

Commit 43e0925

Browse files
author
LocalIdentity
committed
Fix Relic Flask's combining effect with unique flask of the same name
Relic flasks were not being checked to also be unique when we merge the buff effects so they were duplicating Fixed for Tinctures too
1 parent b19fb14 commit 43e0925

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/Modules/CalcPerform.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ function calcs.perform(env, skipEHP)
13981398
mergeBuff(srcList, flaskBuffs, baseName)
13991399
mergeBuff(srcList, flaskBuffsPerBase[item.baseName], baseName)
14001400
end
1401-
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE")) then
1401+
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC")) then
14021402
srcList = new("ModList")
14031403
srcList:ScaleAddList(buffModList, effectModNonPlayer)
14041404
mergeBuff(srcList, flaskBuffsNonPlayer, baseName)
@@ -1410,7 +1410,7 @@ function calcs.perform(env, skipEHP)
14101410
local srcList = new("ModList")
14111411
srcList:ScaleAddList(modList, effectMod)
14121412
local key
1413-
if item.rarity == "UNIQUE" then
1413+
if item.rarity == "UNIQUE" or item.rarity == "RELIC" then
14141414
key = item.title
14151415
else
14161416
key = ""
@@ -1422,7 +1422,7 @@ function calcs.perform(env, skipEHP)
14221422
mergeBuff(srcList, flaskBuffs, key)
14231423
mergeBuff(srcList, flaskBuffsPerBase[item.baseName], key)
14241424
end
1425-
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE")) then
1425+
if (not onlyRecovery or checkNonRecoveryFlasksForMinions) and (flasksApplyToMinion or quickSilverAppliesToAllies or (nonUniqueFlasksApplyToMinion and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC")) then
14261426
srcList = new("ModList")
14271427
srcList:ScaleAddList(modList, effectModNonPlayer)
14281428
mergeBuff(srcList, flaskBuffsNonPlayer, key)
@@ -1522,7 +1522,7 @@ function calcs.perform(env, skipEHP)
15221522
local srcList = new("ModList")
15231523
srcList:ScaleAddList(modList, effectMod)
15241524
local key
1525-
if item.rarity == "UNIQUE" then
1525+
if item.rarity == "UNIQUE" or item.rarity == "RELIC" then
15261526
key = item.title
15271527
else
15281528
key = ""

0 commit comments

Comments
 (0)