From f7470a7bb1d4e741bf30a82a00d7659b062651ab Mon Sep 17 00:00:00 2001 From: Sokomine Date: Mon, 21 Jun 2021 18:22:37 +0200 Subject: [PATCH] made function get_number_from_id accessible --- fs_edit_effects.lua | 2 +- fs_edit_general.lua | 6 +++--- functions.lua | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs_edit_effects.lua b/fs_edit_effects.lua index d771d61..0c79f91 100644 --- a/fs_edit_effects.lua +++ b/fs_edit_effects.lua @@ -374,7 +374,7 @@ yl_speak_up.execute_effect = function(player, n_id, o_id, r) if target_pos_valid == false then local obj = yl_speak_up.speak_to[pname].obj local n_id = yl_speak_up.speak_to[pname].n_id - local npc = get_number_from_id(n_id) + local npc = yl_speak_up.get_number_from_id(n_id) if obj:get_luaentity() and tonumber(npc) then yl_speak_up.log_change(pname, n_id, tostring(r.r_id)..": ".. "NPC at "..minetest.pos_to_string(obj:get_pos(),0).. diff --git a/fs_edit_general.lua b/fs_edit_general.lua index ca7c206..4f6303d 100644 --- a/fs_edit_general.lua +++ b/fs_edit_general.lua @@ -96,7 +96,7 @@ yl_speak_up.eval_and_execute_function = function(player, x_v, id_prefix) if code:byte(1) == 27 then local obj = yl_speak_up.speak_to[pname].obj local n_id = yl_speak_up.speak_to[pname].n_id - local npc = get_number_from_id(n_id) + local npc = yl_speak_up.get_number_from_id(n_id) if obj:get_luaentity() and tonumber(npc) then minetest.log("error","[MOD] yl_speak_up: NPC with ID n_"..npc.." at position "..minetest.pos_to_string(obj:get_pos(),0).." could not compile the content of "..x_id.." :"..dump(code) .. " because of illegal bytecode for player "..pname) else @@ -113,7 +113,7 @@ yl_speak_up.eval_and_execute_function = function(player, x_v, id_prefix) if not f then local obj = yl_speak_up.speak_to[pname].obj local n_id = yl_speak_up.speak_to[pname].n_id - local npc = get_number_from_id(n_id) + local npc = yl_speak_up.get_number_from_id(n_id) if obj:get_luaentity() and tonumber(npc) then minetest.log("error","[MOD] yl_speak_up: NPC with ID n_"..npc.." at position "..minetest.pos_to_string(obj:get_pos(),0).." could not compile the content of "..x_id.." :"..dump(code) .. " for player "..pname) else @@ -127,7 +127,7 @@ yl_speak_up.eval_and_execute_function = function(player, x_v, id_prefix) if not ok then local obj = yl_speak_up.speak_to[pname].obj local n_id = yl_speak_up.speak_to[pname].n_id - local npc = get_number_from_id(n_id) + local npc = yl_speak_up.get_number_from_id(n_id) if obj:get_luaentity() and tonumber(npc) then minetest.log("error","[MOD] yl_speak_up: NPC with ID n_"..npc.." at position "..minetest.pos_to_string(obj:get_pos(),0).." could not execute the content of "..x_id.." :"..dump(code) .. " for player "..pname) else diff --git a/functions.lua b/functions.lua index 1c08fd5..f045026 100644 --- a/functions.lua +++ b/functions.lua @@ -88,7 +88,7 @@ local function get_result_types() return s_grt, t_grt end -local function get_number_from_id(any_id) +yl_speak_up.get_number_from_id = function(any_id) return string.split(any_id, "_")[2] end @@ -117,7 +117,7 @@ yl_speak_up.find_next_id = function(t) local keynum = 1 for k, _ in pairs(t) do - local keynum = tonumber(get_number_from_id(k)) + local keynum = tonumber(yl_speak_up.get_number_from_id(k)) if keynum >= start_id then start_id = keynum + 1 end