From dee1880fd3e123225491f8e2725fab2cb4b01738 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Fri, 29 Jul 2016 17:13:01 +0100 Subject: [PATCH] Add awards.run_trigger_callbacks() and use it --- init.lua | 6 +- readme.md | 8 +++ triggers.lua | 180 +++++++++++++++++---------------------------------- 3 files changed, 71 insertions(+), 123 deletions(-) diff --git a/init.lua b/init.lua index 8725db4..04339a9 100644 --- a/init.lua +++ b/init.lua @@ -36,7 +36,7 @@ awards.register_achievement("award_lightitup",{ trigger = { type = "place", node = "default:torch", - target = 500 + target = 100 } }) @@ -100,7 +100,7 @@ awards.register_achievement("award_obsessed_with_obsidian",{ trigger = { type = "dig", node = "default:obsidian", - target = 1 + target = 50 } }) @@ -124,7 +124,7 @@ awards.register_achievement("award_lumberjack", { trigger = { type = "dig", node = "default:tree", - target = 1 + target = 100 } }) diff --git a/readme.md b/readme.md index 2d48ea6..e1b1655 100644 --- a/readme.md +++ b/readme.md @@ -28,6 +28,14 @@ old fork in Carbone, under same license. * return true to cancel register_on_unlock callbacks and HUD * awards.register_trigger(name, func(awardname, def)) * Note: awards.on[name] is automatically created for triggers +* awards.run_trigger_callbacks(player, data, trigger, table_func(entry)) + * Goes through and checks all triggers registered to a trigger type, + unlocking the award if conditions are met. + * data is the player's award data, ie: awards.players[player_name] + * trigger is the name of the trigger type. Ie: awards.on[trigger] + * table_func is called if the trigger is a table - simply return an + award name to unlock it + * See triggers.lua for examples * awards.register_on_unlock(func(name, def)) * name is the player name * def is the award def. diff --git a/triggers.lua b/triggers.lua index 99a2816..d342c30 100644 --- a/triggers.lua +++ b/triggers.lua @@ -73,6 +73,22 @@ awards.register_onChat = awards.register_on_chat awards.register_onJoin = awards.register_on_join awards.register_onCraft = awards.register_on_craft +function awards.run_trigger_callbacks(player, data, trigger, table_func) + for i = 1, #awards.on[trigger] do + local res = nil + local entry = awards.on[trigger][i] + if type(entry) == "function" then + res = entry(player, data) + elseif type(entry) == "table" and entry.award then + res = table_func(entry) + end + + if res then + awards.unlock(player:get_player_name(), res) + end + end +end + -- Trigger Handles minetest.register_on_dignode(function(pos, oldnode, digger) if not digger or not pos or not oldnode then @@ -97,35 +113,19 @@ minetest.register_on_dignode(function(pos, oldnode, digger) awards.players[playern].count[mod][item]=awards.players[playern].count[mod][item] + 1 -- Run callbacks and triggers - local player = digger local data = awards.players[playern] - for i=1, #awards.on.dig do - local res = nil - if type(awards.on.dig[i]) == "function" then - -- Run trigger callback - res = awards.on.dig[i](player,data) - elseif type(awards.on.dig[i]) == "table" then - -- Handle table trigger - if not awards.on.dig[i].node or not awards.on.dig[i].target or not awards.on.dig[i].award then + awards.run_trigger_callbacks(digger, data, "dig", function(entry) + if entry.node and entry.target then + local tnodedug = string.split(entry.node, ":") + local tmod = tnodedug[1] + local titem = tnodedug[2] + if not tmod or not titem or not data.count[tmod] or not data.count[tmod][titem] then -- table running failed! - print("[ERROR] awards - on.dig trigger "..i.." is invalid!") - else - -- run the table - local tnodedug = string.split(awards.on.dig[i].node, ":") - local tmod=tnodedug[1] - local titem=tnodedug[2] - if tmod==nil or titem==nil or not data.count[tmod] or not data.count[tmod][titem] then - -- table running failed! - elseif data.count[tmod][titem] > awards.on.dig[i].target-1 then - res=awards.on.dig[i].award - end + elseif data.count[tmod][titem] > entry.target-1 then + return entry.award end end - - if res then - awards.unlock(playern,res) - end - end + end) end) minetest.register_on_placenode(function(pos, node, digger) @@ -152,34 +152,19 @@ minetest.register_on_placenode(function(pos, node, digger) awards.players[playern].place[mod][item] = awards.players[playern].place[mod][item] + 1 -- Run callbacks and triggers - local player = digger local data = awards.players[playern] - for i=1,# awards.on.place do - local res = nil - if type(awards.on.place[i]) == "function" then - -- Run trigger callback - res = awards.on.place[i](player,data) - elseif type(awards.on.place[i]) == "table" then - -- Handle table trigger - if not awards.on.place[i].node or not awards.on.place[i].target or not awards.on.place[i].award then - print("[ERROR] awards - on.place trigger "..i.." is invalid!") - else - -- run the table - local tnodedug = string.split(awards.on.place[i].node, ":") - local tmod = tnodedug[1] - local titem = tnodedug[2] - if tmod==nil or titem==nil or not data.place[tmod] or not data.place[tmod][titem] then - -- table running failed! - elseif data.place[tmod][titem] > awards.on.place[i].target-1 then - res = awards.on.place[i].award - end + awards.run_trigger_callbacks(digger, data, "place", function(entry) + if entry.node and entry.target then + local tnodedug = string.split(entry.node, ":") + local tmod = tnodedug[1] + local titem = tnodedug[2] + if not tmod or not titem or not data.place[tmod] or not data.place[tmod][titem] then + -- table running failed! + elseif data.place[tmod][titem] > entry.target-1 then + return entry.award end end - - if res then - awards.unlock(playern,res) - end - end + end) end) minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv) @@ -199,6 +184,7 @@ minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv return end awards.assertPlayer(playern) + awards.tbv(awards.players[playern], "craft") awards.tbv(awards.players[playern].craft, mod) awards.tbv(awards.players[playern].craft[mod], item, 0) @@ -207,34 +193,18 @@ minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv -- Run callbacks and triggers local data = awards.players[playern] - for i=1, #awards.on.craft do - local res = nil - local entry = awards.on.craft[i] - if type(entry) == "function" then - -- Run trigger callback - res = entry(player,data) - elseif type(entry) == "table" then - -- Handle table trigger - if not entry.item or not entry.target or not entry.award then + awards.run_trigger_callbacks(player, data, "craft", function(entry) + if entry.item and entry.target then + local titemcrafted = string.split(entry.item, ":") + local tmod = titemcrafted[1] + local titem = titemcrafted[2] + if not tmod or not titem or not data.craft[tmod] or not data.craft[tmod][titem] then -- table running failed! - print("[ERROR] awards - onCraft trigger "..i.." is invalid!") - else - -- run the table - local titemcrafted = string.split(entry.item, ":") - local tmod=titemcrafted[1] - local titem=titemcrafted[2] - if not tmod==nil or not titem or not data.craft[tmod] or not data.craft[tmod][titem] then - -- table running failed! - elseif data.craft[tmod][titem] > entry.target-1 then - res=awards.on.craft[i].award - end + elseif data.craft[tmod][titem] > entry.target-1 then + return entry.award end end - - if res then - awards.give_achievement(playern,res) - end - end + end) end) minetest.register_on_dieplayer(function(player) @@ -251,22 +221,12 @@ minetest.register_on_dieplayer(function(player) -- Increment counter data.deaths = data.deaths + 1 - -- Run callbacks and triggers - for _,trigger in pairs(awards.on.death) do - local res = nil - if type(trigger) == "function" then - res = trigger(player,data) - elseif type(trigger) == "table" then - if trigger.target and trigger.award then - if data.deaths and data.deaths >= trigger.target then - res = trigger.award - end - end + awards.run_trigger_callbacks(player, data, "death", function(entry) + if entry.target and entry.award and data.deaths and + data.deaths >= entry.target then + return entry.award end - if res ~= nil then - awards.unlock(name,res) - end - end + end) end) minetest.register_on_joinplayer(function(player) @@ -283,22 +243,12 @@ minetest.register_on_joinplayer(function(player) -- Increment counter data.joins = data.joins + 1 - -- Run callbacks and triggers - for _, trigger in pairs(awards.on.join) do - local res = nil - if type(trigger) == "function" then - res = trigger(player,data) - elseif type(trigger) == "table" then - if trigger.target and trigger.award then - if data.joins and data.joins >= trigger.target then - res = trigger.award - end - end + awards.run_trigger_callbacks(player, data, "join", function(entry) + if entry.target and entry.award and data.joins and + data.joins >= entry.target then + return entry.award end - if res ~= nil then - awards.unlock(name,res) - end - end + end) end) minetest.register_on_chat_message(function(name, message) @@ -316,22 +266,12 @@ minetest.register_on_chat_message(function(name, message) -- Increment counter data.chats = data.chats + 1 - -- Run callbacks and triggers - for _,trigger in pairs(awards.on.chat) do - local res = nil - if type(trigger) == "function" then - res = trigger(player,data) - elseif type(trigger) == "table" then - if trigger.target and trigger.award then - if data.chats and data.chats >= trigger.target then - res = trigger.award - end - end + awards.run_trigger_callbacks(player, data, "chat", function(entry) + if entry.target and entry.award and data.chats and + data.chats >= entry.target then + return entry.award end - if res ~= nil then - awards.unlock(name,res) - end - end + end) end) minetest.register_on_newplayer(function(player)