diff --git a/worldeditadditions_commands/commands/extra/basename.lua b/worldeditadditions_commands/commands/extra/basename.lua index 77fa168..39d92b5 100644 --- a/worldeditadditions_commands/commands/extra/basename.lua +++ b/worldeditadditions_commands/commands/extra/basename.lua @@ -7,14 +7,14 @@ worldedit.register_command("basename", { params = "", description = "Returns the base name of nodes that use a given alias.", privs = {worldedit = true}, - parse = function(params_text) - if params_text == "" or not params_text then - return false, "Node not specified." - end - return true, params_text + parse = function(params_text) + if params_text == "" or not params_text then + return false, "Node not specified." + end + return true, params_text end, func = function(name, params_text) - if name == nil then return end - worldedit.player_notify(name, worldedit.normalize_nodename(params_text) or 'Error 404: "'..params_text..'" not found!') + if name == nil then return end + worldedit.player_notify(name, worldedit.normalize_nodename(params_text) or 'Error 404: "'..params_text..'" not found!') end }) diff --git a/worldeditadditions_commands/commands/extra/saplingaliases.lua b/worldeditadditions_commands/commands/extra/saplingaliases.lua index ee2b6cb..a495ca6 100644 --- a/worldeditadditions_commands/commands/extra/saplingaliases.lua +++ b/worldeditadditions_commands/commands/extra/saplingaliases.lua @@ -12,9 +12,9 @@ minetest.register_chatcommand("/saplingaliases", { if params_text == "" or not params_text then params_text = "aliases" end - + local msg = {} - + if params_text == "aliases" then table.insert(msg, "Currently registered aliases:\n") local aliases = worldeditadditions.get_all_sapling_aliases() diff --git a/worldeditadditions_commands/commands/forest.lua b/worldeditadditions_commands/commands/forest.lua index 3271b94..e9d8336 100644 --- a/worldeditadditions_commands/commands/forest.lua +++ b/worldeditadditions_commands/commands/forest.lua @@ -16,7 +16,7 @@ worldedit.register_command("forest", { density = tonumber(match_start) params_text = params_text:sub(#match_start + 1) -- everything starts at 1 in Lua :-/ end - + local success, sapling_list = worldeditadditions.parse_weighted_nodes( worldeditadditions.split(params_text, "%s+", false), false, @@ -43,11 +43,11 @@ worldedit.register_command("forest", { ) if not success then return success, stats end local time_taken = worldeditadditions.human_time(worldeditadditions.get_ms_time() - start_time) - + local distribution_display = worldeditadditions.make_ascii_table( worldeditadditions.node_distribution_to_list(stats.placed, stats.successes) ) - + minetest.log("action", name.." used //forest at "..worldeditadditions.vector.tostring(worldedit.pos1[name]).." - "..worldeditadditions.vector.tostring(worldedit.pos2[name])..", "..stats.successes.." trees placed, averaging "..stats.attempts_avg.." growth attempts / tree and "..stats.failures.." failed attempts in "..time_taken) return true, distribution_display.."\n=========================\n"..stats.successes.." trees placed, averaging "..stats.attempts_avg.." growth attempts / tree and "..stats.failures.." failed attempts in "..time_taken end diff --git a/worldeditadditions_commands/commands/selectors/srect.lua b/worldeditadditions_commands/commands/selectors/srect.lua index e4c85d3..4f28db4 100644 --- a/worldeditadditions_commands/commands/selectors/srect.lua +++ b/worldeditadditions_commands/commands/selectors/srect.lua @@ -4,43 +4,43 @@ -- ██ ██ ██ ██ ██ ██ -- ███████ ██ ██ ███████ ██████ ██ -- lua parse_params_srect("10") --- local +-- local -- TODO: set this to local once development is finished function parse_params_srect(params_text) - local find, _, sn1, ax1, sn2, ax2, len = params_text:find("([+-]?)([xyz]?)%s*([+-]?)([xyz]?)%s*(%d*)") - - -- If ax1 is nil set to player facing dir - if ax1 == "" then ax1 = "get" - else ax1 = {tonumber(sn1..1),string.lower(ax1)} + local find, _, sn1, ax1, sn2, ax2, len = params_text:find("([+-]?)([xyz]?)%s*([+-]?)([xyz]?)%s*(%d*)") + + -- If ax1 is nil set to player facing dir + if ax1 == "" then ax1 = "get" + else ax1 = {tonumber(sn1..1),string.lower(ax1)} end - -- If ax2 is nil set to +y - if ax2 == "" then ax2 = "y" end - ax2 = {tonumber(sn2..1),string.lower(ax2)} - - len = tonumber(len) - if len == nil then - return false, "No length specified." - end - - return true, ax1, ax2, len + -- If ax2 is nil set to +y + if ax2 == "" then ax2 = "y" end + ax2 = {tonumber(sn2..1),string.lower(ax2)} + + len = tonumber(len) + if len == nil then + return false, "No length specified." + end + + return true, ax1, ax2, len end worldedit.register_command("srect", { params = "[ []] ", description = "Set WorldEdit region position 2 at a set distance along 2 axes.", privs = {worldedit=true}, - require_pos = 1, - parse = function(params_text) + require_pos = 1, + parse = function(params_text) local values = {parse_params_srect(params_text)} return unpack(values) end, func = function(name, axis1, axis2, len) - if axis1 == "get" then axis1 = worldeditadditions.player_axis2d(name) end - + if axis1 == "get" then axis1 = worldeditadditions.player_axis2d(name) end + local pos1 = worldedit.pos1[name] - local p2 = {["x"] = pos1.x,["y"] = pos1.y,["z"] = pos1.z} - - p2[axis1[2]] = p2[axis1[2]] + tonumber(len) * axis1[1] - p2[axis2[2]] = p2[axis2[2]] + tonumber(len) * axis2[1] - + local p2 = {["x"] = pos1.x,["y"] = pos1.y,["z"] = pos1.z} + + p2[axis1[2]] = p2[axis1[2]] + tonumber(len) * axis1[1] + p2[axis2[2]] = p2[axis2[2]] + tonumber(len) * axis2[1] + worldedit.pos2[name] = p2 worldedit.mark_pos2(name) worldedit.player_notify(name, "position 2 set to " .. minetest.pos_to_string(p2)) @@ -49,3 +49,4 @@ worldedit.register_command("srect", { -- Tests -- params_text = "-x z 13" +-- params_text = "-x a 13"