From 5ee1bea4ce0b7c0a63f65f240712af2e4c46396e Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sun, 20 Jan 2019 02:12:14 +0100 Subject: [PATCH] Progressive mode: Add a name to filters --- README.md | 2 +- init.lua | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f9a2972..d6cd536 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ end) #### `craftguide.set_progressive_filter(function(recipes, player))` -This function sets an unique recipes filter when progressive mode is enabled. +This function sets an unique recipe filter when progressive mode is enabled. The default `craftguide` progressive filter will be overridden. #### `craftguide.get_progressive_filters()` diff --git a/init.lua b/init.lua index 7ec8a44..313e9b4 100644 --- a/init.lua +++ b/init.lua @@ -63,10 +63,10 @@ craftguide.register_craft_type("digging", { function craftguide.register_craft(def) local func = "craftguide." .. __func() .. "(): " - assert(def.type, func .. "'type' field missing") + assert(def.type, func .. "'type' field missing") assert(def.width, func .. "'width' field missing") assert(def.output, func .. "'output' field missing") - assert(def.items, func .. "'items' field missing") + assert(def.items, func .. "'items' field missing") craftguide.custom_crafts[#craftguide.custom_crafts + 1] = def end @@ -570,14 +570,23 @@ local function progressive_default_filter(recipes, player) return filtered end -local progressive_filters = {progressive_default_filter} +local progressive_filters = {{ + name = "Default filter", + func = progressive_default_filter, +}} -function craftguide.add_progressive_filter(func) - progressive_filters[#progressive_filters + 1] = func +function craftguide.add_progressive_filter(name, func) + progressive_filters[#progressive_filters + 1] = { + name = name, + func = func, + } end -function craftguide.set_progressive_filter(func) - progressive_filters = {func} +function craftguide.set_progressive_filter(name, func) + progressive_filters = {{ + name = name, + func = func, + }} end function craftguide.get_progressive_filters() @@ -586,7 +595,7 @@ end local function apply_progressive_filters(recipes, player) for i = 1, #progressive_filters do - local func = progressive_filters[i] + local func = progressive_filters[i].func recipes = func(recipes, player) end