Skip to content

Fix total more multipliers not being round to nearest percent as done ingame. #4641

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 24, 2022
Merged

Fix total more multipliers not being round to nearest percent as done ingame. #4641

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e45b5
Update ModStore.lua
QuickStick123 Jul 24, 2022
a5f4f9e
support multiple different mod more multiplies correctly.
QuickStick123 Jul 24, 2022
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
6 changes: 4 additions & 2 deletions src/Classes/ModDB.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,20 @@ function ModDBClass:MoreInternal(context, cfg, flags, keywordFlags, source, ...)
local result = 1
for i = 1, select('#', ...) do
local modList = self.mods[select(i, ...)]
local modResult = 1 --The more multiplers for each mod are computed to the nearest percent then applied.
if modList then
for i = 1, #modList do
local mod = modList[i]
if mod.type == "MORE" and band(flags, mod.flags) == mod.flags and MatchKeywordFlags(keywordFlags, mod.keywordFlags) and (not source or mod.source:match("[^:]+") == source) then
if mod[1] then
result = result * (1 + (context:EvalMod(mod, cfg) or 0) / 100)
modResult = modResult * (1 + (context:EvalMod(mod, cfg) or 0) / 100)
else
result = result * (1 + mod.value / 100)
modResult = modResult * (1 + mod.value / 100)
end
end
end
end
result = result * round(modResult,2)
end
if self.parent then
result = result * self.parent:MoreInternal(context, cfg, flags, keywordFlags, source, ...)
Expand Down