mirror of
https://github.com/sbrl/Minetest-WorldEditAdditions.git
synced 2024-11-23 23:53:44 +01:00
torus: fix and improve the error messages
This commit is contained in:
parent
0100725a7b
commit
bf8c847dc1
@ -5,20 +5,15 @@
|
|||||||
-- ██ ██████ ██ ██ ██████ ███████
|
-- ██ ██████ ██ ██ ██████ ███████
|
||||||
local function parse_params_torus(params_text)
|
local function parse_params_torus(params_text)
|
||||||
local parts = worldeditadditions.split(params_text, "%s+", false)
|
local parts = worldeditadditions.split(params_text, "%s+", false)
|
||||||
print("[DEBUG:torus/parts]")
|
|
||||||
for i = 1, #parts, 1 do print(parts[i]) end
|
|
||||||
-- local found, _, major_radius, minor_radius, replace_node, axes = params_text:find("([0-9]+)%s+([0-9]+)%s+([a-z:_\\-]+)%s+([xyz]+)")
|
|
||||||
|
|
||||||
if #parts < 3 then return nil, nil, nil end
|
|
||||||
|
|
||||||
if #parts < 1 then
|
if #parts < 1 then
|
||||||
return false, "Error: Invalid replace_node."
|
return false, "Error: No replace_node specified."
|
||||||
end
|
end
|
||||||
if #parts < 2 then
|
if #parts < 2 then
|
||||||
return false, "Error: Invalid major radius (expected integer greater than 0)"
|
return false, "Error: No major radius specified (expected integer greater than 0)."
|
||||||
end
|
end
|
||||||
if #parts < 3 then
|
if #parts < 3 then
|
||||||
return false, "Error: Invalid minor radius (expected integer greater than 0)"
|
return false, "Error: No minor radius specified (expected integer greater than 0)."
|
||||||
end
|
end
|
||||||
|
|
||||||
local major_radius = tonumber(parts[1])
|
local major_radius = tonumber(parts[1])
|
||||||
@ -38,7 +33,7 @@ local function parse_params_torus(params_text)
|
|||||||
return false, "Error: Invalid node name."
|
return false, "Error: Invalid node name."
|
||||||
end
|
end
|
||||||
if axes:find("[^xyz]") then
|
if axes:find("[^xyz]") then
|
||||||
return false, "Error: The axes may only contain the latters x, y, and z."
|
return false, "Error: The axes may only contain the letters x, y, and z."
|
||||||
end
|
end
|
||||||
if #axes ~= 2 then
|
if #axes ~= 2 then
|
||||||
return false, "Error: Exactly 2 axes must be specified. For example, 'xy' is valid, but 'xyy' is not (both of course without quotes)."
|
return false, "Error: Exactly 2 axes must be specified. For example, 'xy' is valid, but 'xyy' is not (both of course without quotes)."
|
||||||
|
Loading…
Reference in New Issue
Block a user