From e27809d4d7b45fec341c60f5c68c16cb9dc76db9 Mon Sep 17 00:00:00 2001 From: Sokomine Date: Fri, 9 Feb 2024 21:31:30 +0100 Subject: [PATCH] show_fs: npc_list --- fs/fs_npc_list.lua | 9 +++++++++ show_fs.lua | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/fs_npc_list.lua b/fs/fs_npc_list.lua index c6c0dcc..2bc0f00 100644 --- a/fs/fs_npc_list.lua +++ b/fs/fs_npc_list.lua @@ -261,5 +261,14 @@ yl_speak_up.get_fs_show_npc_list = function(pname, selected_row) end +yl_speak_up.register_fs("npc_list", + yl_speak_up.input_npc_list, + yl_speak_up.get_fs_npc_list, + -- no special formspec required: + nil +) + + -- at load/reload of the mod: read the list of existing NPC yl_speak_up.npc_list_load() + diff --git a/show_fs.lua b/show_fs.lua index 6eb0b4b..891d746 100644 --- a/show_fs.lua +++ b/show_fs.lua @@ -60,9 +60,6 @@ yl_speak_up.input_handler = function(player, formname, fields) elseif formname == "yl_speak_up:add_trade_simple" then yl_speak_up.input_add_trade_simple(player, formname, fields) return true - elseif formname == "yl_speak_up:show_npc_list" then - yl_speak_up.input_show_npc_list(player, formname, fields) - return true -- handled in fs_initial_config.lua elseif formname == "yl_speak_up:initial_config" then yl_speak_up.input_fs_initial_config(player, formname, fields) @@ -259,11 +256,6 @@ yl_speak_up.show_fs = function(player, fs_name, param) yl_speak_up.show_fs_ver(pname, "yl_speak_up:add_trade_simple", yl_speak_up.get_fs_add_trade_simple(player, param), 1) - elseif(fs_name == "show_npc_list") then - yl_speak_up.show_fs_ver(pname, "yl_speak_up:show_npc_list", - yl_speak_up.get_fs_show_npc_list(player, nil)) - - elseif(fs_name == "initial_config") then if(not(param)) then param = {}