Skip to content

Fix rounding of scaled mods being incorrect in some cases #8862

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
merged 2 commits into from
Jul 21, 2025
Merged

Fix rounding of scaled mods being incorrect in some cases #8862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
077a448
Fixes #8860: Rounding of scaled mods was incorrect in some cases
Wires77 Jul 18, 2025
8f26805
Don't include boolean or table mods
Wires77 Jul 18, 2025
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/ModList.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function ModListClass:ReplaceModInternal(mod)
end

function ModListClass:MergeMod(mod)
if mod.type == "BASE" or mod.type == "INC" then
Copy link
Member Author

@Wires77 Wires77 Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I felt this was safe because the only places we merge mods are places that don't even have MORE modifiers, let alone multiple. If we end up being able to scale an item that has 2+ more multipliers of the same type though, we should revisit this to make sure it's accurate

if mod.type == "BASE" or mod.type == "INC" or mod.type == "MORE" then
for i = 1, #self do
if modLib.compareModParams(self[i], mod) then
self[i] = copyTable(self[i], true)
Expand Down
18 changes: 14 additions & 4 deletions src/Modules/CalcSetup.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,19 +1051,29 @@ function calcs.initEnv(build, mode, override, specEnv)
end
env.itemModDB:ScaleAddList(combinedList, scale)
elseif item.type == "Gloves" and calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromGloves") ~=1 then
scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromGloves")
scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromGloves") - 1
local combinedList = new("ModList")
for _, mod in ipairs(srcList) do
combinedList:MergeMod(mod)
end
env.itemModDB:ScaleAddList(combinedList, scale)
local scaledList = new("ModList")
scaledList:ScaleAddList(combinedList, scale)
for _, mod in ipairs(scaledList) do
combinedList:MergeMod(mod)
end
env.itemModDB:AddList(combinedList)
Comment on lines +1059 to +1064
Copy link
Member Author

@Wires77 Wires77 Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I duplicated this logic for the gloves even though it's not technically necessary. We should have this logic for all item scaling too for future proofing, most likely

elseif item.type == "Boots" and calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots") ~= 1 then
scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots")
scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots") - 1
local combinedList = new("ModList")
for _, mod in ipairs(srcList) do
combinedList:MergeMod(mod)
end
env.itemModDB:ScaleAddList(combinedList, scale)
local scaledList = new("ModList")
scaledList:ScaleAddList(combinedList, scale)
for _, mod in ipairs(scaledList) do
combinedList:MergeMod(mod)
end
env.itemModDB:AddList(combinedList)
else
env.itemModDB:ScaleAddList(srcList, scale)
end
Expand Down