Skip to content

Commit 78d79d3

Browse files
committed
update for multiple disabled life flasks and refactor into function
1 parent 4b09e3d commit 78d79d3

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

src/Modules/CalcSetup.lua

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,14 @@ function calcs.initEnv(build, mode, override, specEnv)
791791
::continue::
792792
end
793793

794+
local function setLifeRecoveryFromFlasks(item) -- Poisonous Concoction
795+
if item and item.type == "Flask" and item.base.subType == "Life" then
796+
if item.flaskData.lifeTotal > (env.itemModDB.multipliers["LifeFlaskRecovery"] or 0) then
797+
env.itemModDB.multipliers["LifeFlaskRecovery"] = item.flaskData.lifeTotal
798+
end
799+
end
800+
end
801+
794802
if not env.configInput.ignoreItemDisablers then
795803
local itemDisabled = {}
796804
local itemDisablers = {}
@@ -853,9 +861,7 @@ function calcs.initEnv(build, mode, override, specEnv)
853861
end
854862
end
855863
for slot in pairs(trueDisabled) do
856-
if slot:find("Flask") and items[slot] and items[slot].baseName:find("Life Flask") then -- save lifeTotal for PConc if life flask is in disabled slot
857-
env.itemModDB.multipliers["LifeFlaskRecovery"] = items[slot].flaskData.lifeTotal
858-
end
864+
setLifeRecoveryFromFlasks(items[slot])
859865
items[slot] = nil
860866
end
861867
end
@@ -867,12 +873,7 @@ function calcs.initEnv(build, mode, override, specEnv)
867873
if slot.active then
868874
env.flasks[item] = true
869875
end
870-
if item.base.subType == "Life" then
871-
local highestLifeRecovery = env.itemModDB.multipliers["LifeFlaskRecovery"] or 0
872-
if item.flaskData.lifeTotal > highestLifeRecovery then
873-
env.itemModDB.multipliers["LifeFlaskRecovery"] = item.flaskData.lifeTotal
874-
end
875-
end
876+
setLifeRecoveryFromFlasks(item)
876877
item = nil
877878
elseif item and item.type == "Tincture" then
878879
if slot.active then

0 commit comments

Comments
 (0)