From aa707c40ac343fae8185c8c16a84aeba052a2473 Mon Sep 17 00:00:00 2001 From: Sokomine Date: Wed, 7 Feb 2024 06:19:20 +0100 Subject: [PATCH] moved edit_mode.lua to editor/fs/* and added new edit_mode.lua as future init.lua file for editor mod --- editor/edit_mode.lua | 10 ++++++++++ edit_mode.lua => editor/fs/fs_talkdialog_edit_mode.lua | 8 -------- init.lua | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 editor/edit_mode.lua rename edit_mode.lua => editor/fs/fs_talkdialog_edit_mode.lua (99%) diff --git a/editor/edit_mode.lua b/editor/edit_mode.lua new file mode 100644 index 0000000..941c5d8 --- /dev/null +++ b/editor/edit_mode.lua @@ -0,0 +1,10 @@ + +-- is the player in edit mode? +yl_speak_up.in_edit_mode = function(pname) + return pname + and yl_speak_up.edit_mode[pname] + and (yl_speak_up.edit_mode[pname] == yl_speak_up.speak_to[pname].n_id) +end + +-- overrides of functions fo fs/fs_talkdialog.lua when in edit_mode (or for entering/leaving it) +dofile(minetest.get_modpath("yl_speak_up")..DIR_DELIM.."editor/fs/fs_talkdialog_edit_mode.lua") diff --git a/edit_mode.lua b/editor/fs/fs_talkdialog_edit_mode.lua similarity index 99% rename from edit_mode.lua rename to editor/fs/fs_talkdialog_edit_mode.lua index bb73413..7090200 100644 --- a/edit_mode.lua +++ b/editor/fs/fs_talkdialog_edit_mode.lua @@ -1,12 +1,4 @@ --- is the player in edit mode? -yl_speak_up.in_edit_mode = function(pname) - return pname - and yl_speak_up.edit_mode[pname] - and (yl_speak_up.edit_mode[pname] == yl_speak_up.speak_to[pname].n_id) -end - - -- This is the main talkdialog the NPC shows when right-clicked. (now in edit_mode) local old_input_talk = yl_speak_up.input_talk yl_speak_up.input_talk = function(player, formname, fields) diff --git a/init.lua b/init.lua index 761287e..7767a54 100644 --- a/init.lua +++ b/init.lua @@ -264,7 +264,7 @@ yl_speak_up.reload = function(modpath, log_entry) dofile(modpath .. "interface_mobs_api.lua") -- functions and overrides for edit mode - dofile(modpath .. "edit_mode.lua") + dofile(modpath .. "editor/edit_mode.lua") -- initialize and load all registered generic dialogs yl_speak_up.load_generic_dialogs()