Modify outset and inset to accept both hv and vh combinations. Update documentation...

diff --git a/ChatCommands.md b/ChatCommands.md
index 6dc4c7279629238eae3fb04d065fbab374567e86..b26e89413f605ed7a44760a29ca2e5594617104f 100644 (file)
--- a/ChatCommands.md
+++ b/ChatCommands.md
@@ -408,14 +408,14 @@ opposite direction over the same axis by `[reverse-amount]`.
 \r
                //expand right 7 5\r
                \r
-### `//outset [h|v] <amount>`\r
+### `//outset [hv] <amount>`\r
 \r
 Expands the selection in all directions by `<amount>`. If specified, the selection can be expanded horizontally in the x and z axes `[h]`\r
 or vertically in the y axis `[v]`.\r
 \r
                //outset v 5\r
                \r
-### `//inset [h|v] <amount>`\r
+### `//inset [hv] <amount>`\r
 \r
 Contracts the selection in all directions by `<amount>`. If specified, the selection can be contracted horizontally in the x and z axes `[h]`\r
 or vertically in the y axis `[v]`.\r

diff --git a/worldedit_commands/cuboid.lua b/worldedit_commands/cuboid.lua
index 003b358224820de9498b840b578b51987a27abfc..24dad28b3ced4ea3cb1ee4c6fa783a954eeff628 100644 (file)
--- a/worldedit_commands/cuboid.lua
+++ b/worldedit_commands/cuboid.lua
@@ -6,7 +6,7 @@ minetest.register_chatcommand("/outset", {
        description = "outset the selection",
        privs = {worldedit=true},
        func = function(name, param)
-               local find, _, dir, amount = param:find("([hv]?)%s*([+-]?%d+)")
+               local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
                
                if find == nil then
                        return false, "invalid usage: " .. param
@@ -20,7 +20,13 @@ minetest.register_chatcommand("/outset", {
                                "Undefined region. Region must be defined beforehand."
                end
                
-               if dir == "" then
+               local hv_test = dir:find("[^hv]+")
+               
+               if hv_test ~= nil then
+                       return false, "Invalid direction."
+               end
+               
+               if dir == "" or dir == "hv" or dir == "vh" then
                        assert(worldedit.cuboid_volumetric_expand(name, amount))
                elseif dir == "h" then
                        assert(worldedit.cuboid_linear_expand(name, 'x', 1, amount))
@@ -31,7 +37,7 @@ minetest.register_chatcommand("/outset", {
                        assert(worldedit.cuboid_linear_expand(name, 'y', 1, amount))
                        assert(worldedit.cuboid_linear_expand(name, 'y', -1, amount))
                else
-                       return false, "Unknown error"
+                       return false, "Invalid number of arguments"
                end
                
                worldedit.marker_update(name)
@@ -46,7 +52,7 @@ minetest.register_chatcommand("/inset", {
        description = "inset the selection",
        privs = {worldedit=true},
        func = function(name, param)
-               local find, _, dir, amount = param:find("([hv]?)%s*([+-]?%d+)")
+               local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
                
                if find == nil then
                        return false, "invalid usage: " .. param
@@ -60,7 +66,13 @@ minetest.register_chatcommand("/inset", {
                                "Undefined region. Region must be defined beforehand."
                end
                
-               if dir == "" then
+               local hv_test = dir:find("[^hv]+")
+               
+               if hv_test ~= nil then
+                       return false, "Invalid direction."
+               end
+               
+               if dir == "" or dir == "vh" or dir == "hv" then
                        assert(worldedit.cuboid_volumetric_expand(name, -amount))
                elseif dir == "h" then
                        assert(worldedit.cuboid_linear_expand(name, 'x', 1, -amount))
@@ -71,7 +83,7 @@ minetest.register_chatcommand("/inset", {
                        assert(worldedit.cuboid_linear_expand(name, 'y', 1, -amount))
                        assert(worldedit.cuboid_linear_expand(name, 'y', -1, -amount))
                else
-                       return false, "Unknown error"
+                       return false, "Invalid number of arguments"
                end
                
                worldedit.marker_update(name)