diff --git a/editor/fs/fs_edit_actions.lua b/editor/fs/fs_edit_actions.lua index 949d7ee..1b94fb1 100644 --- a/editor/fs/fs_edit_actions.lua +++ b/editor/fs/fs_edit_actions.lua @@ -97,7 +97,7 @@ end -- these are only wrapper functions for those in fs_edit_general.lua -yl_speak_up.input_fs_edit_actions = function(player, formname, fields) +yl_speak_up.input_edit_actions = function(player, formname, fields) return yl_speak_up.handle_input_fs_edit_option_related(player, formname, fields, "a_", "actions", yl_speak_up.max_actions, "(A)ctions", "tmp_action", diff --git a/editor/fs/fs_edit_effects.lua b/editor/fs/fs_edit_effects.lua index 9cd501f..d9bb8dd 100644 --- a/editor/fs/fs_edit_effects.lua +++ b/editor/fs/fs_edit_effects.lua @@ -314,7 +314,7 @@ end -- these are only wrapper functions for those in fs_edit_general.lua -yl_speak_up.input_fs_edit_effects = function(player, formname, fields) +yl_speak_up.input_edit_effects = function(player, formname, fields) return yl_speak_up.handle_input_fs_edit_option_related(player, formname, fields, "r_", "o_results", yl_speak_up.max_result_effects, "(Ef)fect", "tmp_result", diff --git a/editor/fs/fs_edit_preconditions.lua b/editor/fs/fs_edit_preconditions.lua index 0cb15a3..e500c4b 100644 --- a/editor/fs/fs_edit_preconditions.lua +++ b/editor/fs/fs_edit_preconditions.lua @@ -329,7 +329,7 @@ end -- these are only wrapper functions for those in fs_edit_general.lua -yl_speak_up.input_fs_edit_preconditions = function(player, formname, fields) +yl_speak_up.input_edit_preconditions = function(player, formname, fields) return yl_speak_up.handle_input_fs_edit_option_related(player, formname, fields, "p_", "o_prerequisites", yl_speak_up.max_prerequirements, "pre(C)ondition", "tmp_prereq", diff --git a/editor/fs/fs_export.lua b/editor/fs/fs_export.lua index 97084af..d9c7546 100644 --- a/editor/fs/fs_export.lua +++ b/editor/fs/fs_export.lua @@ -1,6 +1,6 @@ -yl_speak_up.input_fs_export = function(player, formname, fields) +yl_speak_up.input_export = function(player, formname, fields) if(fields and fields.back) then return yl_speak_up.show_fs(player, "talk") elseif(fields and fields.show_readable) then diff --git a/editor/fs/fs_manage_quest_steps.lua b/editor/fs/fs_manage_quest_steps.lua index 0522256..354dc8f 100644 --- a/editor/fs/fs_manage_quest_steps.lua +++ b/editor/fs/fs_manage_quest_steps.lua @@ -357,7 +357,7 @@ end yl_speak_up.register_fs("manage_quest_steps", - yl_speak_up.input_manage_quest_steps, + yl_speak_up.input_fs_manage_quest_steps, yl_speak_up.get_fs_manage_quest_steps, -- no special formspec required: nil diff --git a/editor/fs/fs_manage_quests.lua b/editor/fs/fs_manage_quests.lua index d50bb9e..fac3b87 100644 --- a/editor/fs/fs_manage_quests.lua +++ b/editor/fs/fs_manage_quests.lua @@ -241,7 +241,7 @@ end yl_speak_up.register_fs("manage_quests", - yl_speak_up.input_manage_quests, + yl_speak_up.input_fs_manage_quests, yl_speak_up.get_fs_manage_quests, -- no special formspec required: nil diff --git a/editor/fs/fs_manage_variables.lua b/editor/fs/fs_manage_variables.lua index 89dda12..794ba90 100644 --- a/editor/fs/fs_manage_variables.lua +++ b/editor/fs/fs_manage_variables.lua @@ -476,7 +476,7 @@ end yl_speak_up.register_fs("manage_variables", - yl_speak_up.input_manage_variables, + yl_speak_up.input_fs_manage_variables, yl_speak_up.get_fs_manage_variables, -- no special formspec required: nil diff --git a/editor/fs/fs_notes.lua b/editor/fs/fs_notes.lua index 9db55f2..84fd44f 100644 --- a/editor/fs/fs_notes.lua +++ b/editor/fs/fs_notes.lua @@ -1,6 +1,6 @@ -yl_speak_up.input_fs_notes = function(player, formname, fields) +yl_speak_up.input_notes = function(player, formname, fields) if(fields and fields.back) then return yl_speak_up.show_fs(player, "talk") elseif(fields and fields.store_notes and fields.notes_text) then diff --git a/editor/fs/fs_show_what_points_to_this_dialog.lua b/editor/fs/fs_show_what_points_to_this_dialog.lua index 7f4ff53..d4319e2 100644 --- a/editor/fs/fs_show_what_points_to_this_dialog.lua +++ b/editor/fs/fs_show_what_points_to_this_dialog.lua @@ -1,6 +1,6 @@ -- helpful for debugging the content/texts of the created dialog structure -yl_speak_up.input_fs_show_what_points_to_this_dialog = function(player, formname, fields) +yl_speak_up.input_show_what_points_to_this_dialog = function(player, formname, fields) local pname = player:get_player_name() if(fields.back_from_show_what_points_here or not(fields.turn_dialog_into_alternate_text)) then @@ -131,7 +131,7 @@ end -- show which dialogs point/lead to this_dialog -yl_speak_up.show_what_points_to_this_dialog = function(player, this_dialog) +yl_speak_up.get_fs_show_what_points_to_this_dialog = function(player, this_dialog) local pname = player:get_player_name() local dialog = yl_speak_up.speak_to[pname].dialog if(not(dialog) diff --git a/editor/trade_in_edit_mode.lua b/editor/trade_in_edit_mode.lua index 64a370a..21aaddd 100644 --- a/editor/trade_in_edit_mode.lua +++ b/editor/trade_in_edit_mode.lua @@ -92,3 +92,12 @@ yl_speak_up.input_add_trade_simple = function(player, formname, fields, input_to return old_input_add_trade_simple(player, formname, fields, input_to) end + +yl_speak_up.register_fs("add_trade_simple", + -- the input function is a new one now + yl_speak_up.input_add_trade_simple, + -- the get_fs function stays the same + yl_speak_up.get_fs_add_trade_simple_wrapper, + -- force formspec version 1 (not changed): + 1 +)