mtcontrib
/
Minetest-WorldEdit
mirror of https://github.com/Uberi/Minetest-WorldEdit.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Reimplement /expand and /contract to conform to WE standards

This commit is contained in:
Daniel Sosa 2015-02-16 03:46:45 +00:00
parent d5e004be67
commit f8f1f3b9cc
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
worldedit_commands/cuboid.lua
View File

@ -122,11 +122,12 @@ minetest.register_chatcommand("/shift", {
minetest.register_chatcommand("/expand", { minetest.register_chatcommand("/expand", {
params = "<amount> [reverse-amount] [up|down|left|right|front|back]", params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
description = "expand the selection in one or two directions at once", description = "expand the selection in one or two directions at once",
privs = {worldedit=true}, privs = {worldedit=true},
func = function(name, param) func = function(name, param)
local find, _, amount, arg2, arg3 = param:find("(%d+)%s*(%w*)%s*(%l*)") local find, _, sign, direction, amount,
rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
if find == nil then if find == nil then
worldedit.player_notify(name, "invalid use: " .. param) worldedit.player_notify(name, "invalid use: " .. param)
@ -139,26 +140,34 @@ minetest.register_chatcommand("/expand", {
return return
end end
local tmp = tonumber(arg2) local absolute = direction:find("[xyz?]")
local axis, dir local dir, axis
local reverse_amount = 0
axis,dir = worldedit.player_axis(name) if rev_amount == "" then
rev_amount = 0
end
if arg2 ~= "" then if absolute == nil then
if tmp == nil then axis, dir = worldedit.translate_direction(name, direction)
axis, dir = worldedit.translate_direction(name, arg2)
if axis == nil or dir == nil then
return false, "Invalid if looking straight up or down"
end
else else
reverse_amount = tmp if direction == "?" then
axis, dir = worldedit.player_axis(name)
else
axis = direction
dir = 1
end end
end end
if arg3 ~= "" then if sign == "-" then
axis, dir = worldedit.translate_direction(name, arg3) dir = -dir
end end
worldedit.cuboid_linear_expand(name, axis, dir, amount) worldedit.cuboid_linear_expand(name, axis, dir, amount)
worldedit.cuboid_linear_expand(name, axis, -dir, reverse_amount) worldedit.cuboid_linear_expand(name, axis, -dir, rev_amount)
worldedit.marker_update(name) worldedit.marker_update(name)
end, end,
} }
@ -166,11 +175,12 @@ minetest.register_chatcommand("/expand", {
minetest.register_chatcommand("/contract", { minetest.register_chatcommand("/contract", {
params = "<amount> [reverse-amount] [up|down|left|right|front|back]", params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
description = "contract the selection in one or two directions at once", description = "contract the selection in one or two directions at once",
privs = {worldedit=true}, privs = {worldedit=true},
func = function(name, param) func = function(name, param)
local find, _, amount, arg2, arg3 = param:find("(%d+)%s*(%w*)%s*(%l*)") local find, _, sign, direction, amount,
rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
if find == nil then if find == nil then
worldedit.player_notify(name, "invalid use: " .. param) worldedit.player_notify(name, "invalid use: " .. param)
@ -183,26 +193,34 @@ minetest.register_chatcommand("/contract", {
return return
end end
local tmp = tonumber(arg2) local absolute = direction:find("[xyz?]")
local axis, dir local dir, axis
local reverse_amount = 0
axis,dir = worldedit.player_axis(name) if rev_amount == "" then
rev_amount = 0
end
if arg2 ~= "" then if absolute == nil then
if tmp == nil then axis, dir = worldedit.translate_direction(name, direction)
axis, dir = worldedit.translate_direction(name, arg2)
if axis == nil or dir == nil then
return false, "Invalid if looking straight up or down"
end
else else
reverse_amount = tmp if direction == "?" then
axis, dir = worldedit.player_axis(name)
else
axis = direction
dir = 1
end end
end end
if arg3 ~= "" then if sign == "-" then
axis, dir = worldedit.translate_direction(name, arg3) dir = -dir
end end
worldedit.cuboid_linear_expand(name, axis, dir, -amount) worldedit.cuboid_linear_expand(name, axis, dir, -amount)
worldedit.cuboid_linear_expand(name, axis, -dir, -reverse_amount) worldedit.cuboid_linear_expand(name, axis, -dir, -rev_amount)
worldedit.marker_update(name) worldedit.marker_update(name)
end, end,
} }