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

Remove datakey and use trigger names instead

Browse Source
This commit is contained in:
rubenwardy 2018-04-04 18:36:47 +01:00
parent eaab883e71
commit cca278024d
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api.lua
View File

@ -74,8 +74,6 @@ function awards.register_trigger(tname, tdef)
tdef.name = tname tdef.name = tname
tdef.run_callbacks = run_trigger_callbacks tdef.run_callbacks = run_trigger_callbacks
local datakey = tname .. "s"
tdef.data_key = datakey
if tdef.type == "counted" then if tdef.type == "counted" then
local old_reg = tdef.on_register local old_reg = tdef.on_register
@ -88,7 +86,7 @@ function awards.register_trigger(tname, tdef)
tdef.register(tmp) tdef.register(tmp)
function def.getProgress(_, data) function def.getProgress(_, data)
local done = data[datakey] or 0 local done = data[tname] or 0
return { return {
perc = done / tmp.target, perc = done / tmp.target,
label = S(tdef.progress, done, tmp.target), label = S(tdef.progress, done, tmp.target),
@ -112,8 +110,8 @@ function awards.register_trigger(tname, tdef)
print(dump(data)) print(dump(data))
-- Increment counter -- Increment counter
local currentVal = (data[datakey] or 0) + 1 local currentVal = (data[tname] or 0) + 1
data[datakey] = currentVal data[tname] = currentVal
tdef:run_callbacks(player, data, function(entry) tdef:run_callbacks(player, data, function(entry)
if entry.target and entry.award and currentVal and if entry.target and entry.award and currentVal and
@ -137,11 +135,11 @@ function awards.register_trigger(tname, tdef)
function def.getProgress(_, data) function def.getProgress(_, data)
local done local done
data[datakey] = data[datakey] or {} data[tname] = data[tname] or {}
if tmp.key then if tmp.key then
done = data[datakey][tmp.key] or 0 done = data[tname][tmp.key] or 0
else else
done = data[datakey].__total or 0 done = data[tname].__total or 0
end end
return { return {
perc = done / tmp.target, perc = done / tmp.target,
@ -175,17 +173,17 @@ function awards.register_trigger(tname, tdef)
print(dump(data)) print(dump(data))
-- Increment counter -- Increment counter
data[datakey] = data[datakey] or {} data[tname] = data[tname] or {}
local currentVal = (data[datakey][key] or 0) + n local currentVal = (data[tname][key] or 0) + n
data[datakey][key] = currentVal data[tname][key] = currentVal
data[datakey].__total = (data[datakey].__total or 0) + n data[tname].__total = (data[tname].__total or 0) + n
tdef:run_callbacks(player, data, function(entry) tdef:run_callbacks(player, data, function(entry)
local current local current
if entry.key == key then if entry.key == key then
current = currentVal current = currentVal
elseif entry.key == nil then elseif entry.key == nil then
current = data[datakey].__total current = data[tname].__total
else else
return return
end end