From 20056cb1e969a6e3b60c4116ab70e9297c59db1f Mon Sep 17 00:00:00 2001 From: Sokomine Date: Fri, 9 Feb 2024 19:55:21 +0100 Subject: [PATCH] show_fs: edit_(preconditions/actions/effects) --- editor/fs/fs_edit_actions.lua | 8 ++++++++ editor/fs/fs_edit_effects.lua | 8 ++++++++ editor/fs/fs_edit_preconditions.lua | 8 ++++++++ show_fs.lua | 24 ------------------------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/editor/fs/fs_edit_actions.lua b/editor/fs/fs_edit_actions.lua index f8c8f10..949d7ee 100644 --- a/editor/fs/fs_edit_actions.lua +++ b/editor/fs/fs_edit_actions.lua @@ -123,3 +123,11 @@ yl_speak_up.get_fs_edit_actions = function(player, table_click_result) nil -- nothing block-related to do here ) end + + +yl_speak_up.register_fs("edit_actions", + yl_speak_up.input_edit_actions, + yl_speak_up.get_fs_edit_actions, + -- no special formspec required: + nil +) diff --git a/editor/fs/fs_edit_effects.lua b/editor/fs/fs_edit_effects.lua index 55dfb1b..9cd501f 100644 --- a/editor/fs/fs_edit_effects.lua +++ b/editor/fs/fs_edit_effects.lua @@ -342,3 +342,11 @@ yl_speak_up.get_fs_edit_effects = function(player, table_click_result) "The NPC shall do something to the block at the following position:" ) end + + +yl_speak_up.register_fs("edit_effects", + yl_speak_up.input_edit_effects, + yl_speak_up.get_fs_edit_effects, + -- no special formspec required: + nil +) diff --git a/editor/fs/fs_edit_preconditions.lua b/editor/fs/fs_edit_preconditions.lua index 401be22..0cb15a3 100644 --- a/editor/fs/fs_edit_preconditions.lua +++ b/editor/fs/fs_edit_preconditions.lua @@ -360,3 +360,11 @@ yl_speak_up.get_fs_edit_preconditions = function(player, table_click_result) "The following shall be true about the block:" ) end + + +yl_speak_up.register_fs("edit_preconditions", + yl_speak_up.input_edit_preconditions, + yl_speak_up.get_fs_edit_preconditions, + -- no special formspec required: + nil +) diff --git a/show_fs.lua b/show_fs.lua index 6df15b1..46bdd85 100644 --- a/show_fs.lua +++ b/show_fs.lua @@ -98,14 +98,6 @@ yl_speak_up.input_handler = function(player, formname, fields) elseif formname == "yl_speak_up:assign_quest_step" then yl_speak_up.input_fs_assign_quest_step(player, formname, fields) return true - -- handled in fs_edit_preconditions.lua - elseif formname == "yl_speak_up:edit_preconditions" then - yl_speak_up.input_fs_edit_preconditions(player, formname, fields) - return true - -- handled in fs_edit_actions.lua - elseif formname == "yl_speak_up:edit_actions" then - yl_speak_up.input_fs_edit_actions(player, formname, fields) - return true -- handled in fs_edit_actions.lua elseif formname == "yl_speak_up:action_npc_gives" then yl_speak_up.input_fs_action_npc_gives(player, formname, fields) @@ -119,10 +111,6 @@ yl_speak_up.input_handler = function(player, formname, fields) elseif formname == "yl_speak_up:action_evaluate" then yl_speak_up.input_fs_action_evaluate(player, formname, fields) return true - -- handled in fs_edit_effects.lua - elseif formname == "yl_speak_up:edit_effects" then - yl_speak_up.input_fs_edit_effects(player, formname, fields) - return true -- handled in fs_manage_variables.lua elseif formname == "yl_speak_up:manage_variables" then yl_speak_up.input_fs_manage_variables(player, formname, fields) @@ -406,18 +394,6 @@ yl_speak_up.show_fs = function(player, fs_name, param) yl_speak_up.show_fs_ver(pname, "yl_speak_up:assign_quest_step", yl_speak_up.get_fs_assign_quest_step(player, param)) - elseif(fs_name == "edit_preconditions") then - yl_speak_up.show_fs_ver(pname, "yl_speak_up:edit_preconditions", - yl_speak_up.get_fs_edit_preconditions(player, param)) - - elseif(fs_name == "edit_actions") then - yl_speak_up.show_fs_ver(pname, "yl_speak_up:edit_actions", - yl_speak_up.get_fs_edit_actions(player, param)) - - elseif(fs_name == "edit_effects") then - yl_speak_up.show_fs_ver(pname, "yl_speak_up:edit_effects", - yl_speak_up.get_fs_edit_effects(player, param)) - -- action related elseif(fs_name == "action_npc_gives") then yl_speak_up.show_fs_ver(pname, "yl_speak_up:action_npc_gives",