Skip to content

Commit

Permalink
Fix flask effect tooltips and onslaught flask effect calculation (#5743)
Browse files Browse the repository at this point in the history
Recent change added actorCondition = player to flask effect but this
wasnt accounted for in these 2 scenarios.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
  • Loading branch information
deathbeam authored Mar 2, 2023
1 parent 8dbb87d commit 567663a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/Classes/ItemsTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3097,10 +3097,10 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
local modDB = self.build.calcsTab.mainEnv.modDB
local output = self.build.calcsTab.mainOutput
local durInc = modDB:Sum("INC", nil, "FlaskDuration")
local effectInc = modDB:Sum("INC", nil, "FlaskEffect")
local effectInc = modDB:Sum("INC", { actor = "player" }, "FlaskEffect")

if item.rarity == "MAGIC" and not item.base.flask.life and not item.base.flask.mana then
effectInc = effectInc + modDB:Sum("INC", nil, "MagicUtilityFlaskEffect")
effectInc = effectInc + modDB:Sum("INC", { actor = "player" }, "MagicUtilityFlaskEffect")
end

if item.base.flask.life or item.base.flask.mana then
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/CalcPerform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -945,9 +945,9 @@ local function doActorMisc(env, actor)
if item.baseName:match("Silver Flask") then
onslaughtFromFlask = true

local curFlaskEffectInc = item.flaskData.effectInc + modDB:Sum("INC", nil, "FlaskEffect")
local curFlaskEffectInc = item.flaskData.effectInc + modDB:Sum("INC", { actor = "player" }, "FlaskEffect")
if item.rarity == "MAGIC" then
curFlaskEffectInc = curFlaskEffectInc + modDB:Sum("INC", nil, "MagicUtilityFlaskEffect")
curFlaskEffectInc = curFlaskEffectInc + modDB:Sum("INC", { actor = "player" }, "MagicUtilityFlaskEffect")
end

if flaskEffectInc < curFlaskEffectInc / 100 then
Expand Down

0 comments on commit 567663a

Please sign in to comment.