Skip to content

Fix merit math in pointwatch.lua. #1883

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
z16 merged 1 commit into from
Jun 3, 2020
Merged

Fix merit math in pointwatch.lua. #1883

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
6 changes: 3 additions & 3 deletions addons/pointwatch/pointwatch.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,13 +315,13 @@ function exp_msg(val,msg)
elseif msg == 371 or msg == 372 then
lp.registry[t] = (lp.registry[t] or 0) + val
lp.current = lp.current + val
if lp.current + val >= lp.tnm and lp.number_of_merits ~= lp.maximum_merits then
if lp.current >= lp.tnm and lp.number_of_merits ~= lp.maximum_merits then
-- Merit Point gained!
lp.number_of_merits = lp.number_of_merits + math.min(math.floor(lp.current/lp.tnm),lp.maximum_merits)
lp.number_of_merits = math.min(lp.number_of_merits + math.floor(lp.current/lp.tnm),lp.maximum_merits)
lp.current = lp.current%lp.tnm
else
-- If a merit point was not gained,
lp.current = math.min(lp.current+val,lp.tnm-1)
lp.current = math.min(lp.current,lp.tnm-1)
end
end
update_box()
Expand Down