simplified scol

This commit is contained in:
VorTechnix 2021-03-09 11:19:47 -08:00
parent a671f742e9
commit 234e0a1325
2 changed files with 14 additions and 19 deletions

@ -9,31 +9,26 @@ worldedit.register_command("scol", {
privs = {worldedit=true}, privs = {worldedit=true},
require_pos = 1, require_pos = 1,
parse = function(params_text) parse = function(params_text)
local wea = worldeditadditions local wea, vec, tmp = worldeditadditions, vector.new(0, 0, 0), {}
local find = wea.split(params_text, "%s", false) local find = wea.split(params_text, "%s", false)
local ax1, len = find[1], find[table.maxn(find)] local ax1, sn1, len = (tostring(find[1]):match('[xyz]') or "g"):sub(1,1), wea.getsign(find[1]), find[table.maxn(find)]
-- If ax1 is bad set to player facing dir tmp.len = tonumber(len)
if ax1 == len or not ax1:match('[xyz]') then ax1 = "get"
else ax1 = { wea.getsign(ax1), ax1:gsub('[^xyz]', ''):sub(1, 1) } end
len = tonumber(len)
-- If len == nill cancel the operation -- If len == nill cancel the operation
if len == nil then if tmp.len == nil then return false, "No length specified." end
return false, "No length specified." -- If ax1 is bad send "get" order
end if ax1 == "g" then tmp.get = true
else vec[ax1] = sn1 * tmp.len end
return true, ax1, len return true, vec, tmp
end, end,
func = function(name, axis1, len) func = function(name, vec, tmp)
if axis1 == "get" then if tmp.get then
ax1, dir = worldedit.player_axis(name) local ax, dir = worldeditadditions.player_axis2d(name)
axis1 = {dir,ax1} vec[ax] = tmp.len * dir
end end
local p2 = vector.new(worldedit.pos1[name]) local p2 = vector.add(vec,worldedit.pos1[name])
p2[axis1[2]] = p2[axis1[2]] + tonumber(len) * axis1[1]
worldedit.pos2[name] = p2 worldedit.pos2[name] = p2
worldedit.mark_pos2(name) worldedit.mark_pos2(name)
return true, "position 2 set to " .. minetest.pos_to_string(p2) return true, "position 2 set to " .. minetest.pos_to_string(p2)

@ -30,7 +30,7 @@ worldedit.register_command("srect", {
vec[ax] = tmp.len * dir vec[ax] = tmp.len * dir
end end
p2 = vector.add(vec,worldedit.pos1[name]) local p2 = vector.add(vec,worldedit.pos1[name])
worldedit.pos2[name] = p2 worldedit.pos2[name] = p2
worldedit.mark_pos2(name) worldedit.mark_pos2(name)
return true, "position 2 set to " .. minetest.pos_to_string(p2) return true, "position 2 set to " .. minetest.pos_to_string(p2)