Skip to content

Fix tincture effect calculation for imported tinctures #9039

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

Fix tincture effect calculation for imported tinctures #9039

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3715,7 +3715,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
if item.rarity == "MAGIC" then
effectInc = effectInc + modDB:Sum("INC", { actor = "player" }, "MagicTinctureEffect")
end
local effectMod = (1 + (tinctureData.effectInc + effectInc) / 100) * (1 + (item.quality or 0) / 100)
local effectMod = item.crafted and (1 + (tinctureData.effectInc + effectInc) / 100) * (1 + (item.quality or 0) / 100) or (1 + effectInc / 100)
if effectMod ~= 1 then
t_insert(stats, s_format("^8Tincture effect modifier: ^7%+d%%", effectMod * 100 - 100))
end
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,13 +1562,13 @@ function calcs.perform(env, skipEHP)
local tinctureBuffsPerBase = {}

local function calcTinctureMods(item, baseName, buffModList, modList)
local tinctureEffectInc = effectInc + item.tinctureData.effectInc
local tinctureEffectInc = effectInc + (item.crafted and item.tinctureData.effectInc or 0)
if item.rarity == "MAGIC" then
tinctureEffectInc = tinctureEffectInc + effectIncMagic
end
-- Compute tincture effect multiplier.
-- Tincture effect multiplier is rounded to 2 decimal places before applying it.
local effectMod = math.floor((1 + (tinctureEffectInc) / 100) * (1 + (item.quality or 0) / 100) * 100) / 100
local effectMod = math.floor((1 + (tinctureEffectInc) / 100) * (1 + (item.crafted and item.quality or 0) / 100) * 100) / 100

-- same deal as flasks, go look at the comment there
if buffModList[1] then
Expand Down