crabman77/awards
1
0
Fork 0
forked from nalc/awards
Code Issues Pull Requests Projects Releases Wiki Activity

Fix progress exceeding target

Browse Source
This commit is contained in:
rubenwardy 2018-09-14 10:55:55 +01:00
parent 805720b4af
commit 38b7d9aa91
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api_triggers.lua
View File

@ -44,7 +44,7 @@ function awards.register_trigger(tname, tdef)
tdef.register(tmp) tdef.register(tmp)
function def.getProgress(_, data) function def.getProgress(_, data)
local done = data[tname] or 0 local done = math.min(data[tname] or 0, tmp.target)
return { return {
perc = done / tmp.target, perc = done / tmp.target,
label = S(tdef.progress, done, tmp.target), label = S(tdef.progress, done, tmp.target),
@ -103,13 +103,16 @@ function awards.register_trigger(tname, tdef)
-- Called to get progress values and labels -- Called to get progress values and labels
function def.getProgress(_, data) function def.getProgress(_, data)
local done
data[tname] = data[tname] or {} data[tname] = data[tname] or {}
local done
if tmp.key then if tmp.key then
done = data[tname][tmp.key] or 0 done = data[tname][tmp.key] or 0
else else
done = data[tname].__total or 0 done = data[tname].__total or 0
end end
done = math.min(done, tmp.target)
return { return {
perc = done / tmp.target, perc = done / tmp.target,
label = S(tdef.progress, done, tmp.target), label = S(tdef.progress, done, tmp.target),