summaryrefslogtreecommitdiff
path: root/worldedit_commands
diff options
context:
space:
mode:
Diffstat (limited to 'worldedit_commands')
-rw-r--r--worldedit_commands/.gitignore1
-rw-r--r--worldedit_commands/cuboid.lua240
-rw-r--r--worldedit_commands/init.lua47
-rw-r--r--worldedit_commands/mark.lua6
4 files changed, 281 insertions, 13 deletions
diff --git a/worldedit_commands/.gitignore b/worldedit_commands/.gitignore
new file mode 100644
index 0000000..e4e5f6c
--- /dev/null
+++ b/worldedit_commands/.gitignore
@@ -0,0 +1 @@
+*~ \ No newline at end of file
diff --git a/worldedit_commands/cuboid.lua b/worldedit_commands/cuboid.lua
new file mode 100644
index 0000000..88f0260
--- /dev/null
+++ b/worldedit_commands/cuboid.lua
@@ -0,0 +1,240 @@
+minetest.register_chatcommand("/outset", {
+ params = "[h|v] <amount>",
+ description = "outset the selection",
+ privs = {worldedit=true},
+ func = function(name, param)
+ local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
+
+ if find == nil then
+ return false, "invalid usage: " .. param
+ end
+
+ local pos1 = worldedit.pos1[name]
+ local pos2 = worldedit.pos2[name]
+
+ if pos1 == nil or pos2 == nil then
+ return false,
+ "Undefined region. Region must be defined beforehand."
+ end
+
+ 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))
+ assert(worldedit.cuboid_linear_expand(name, 'x', -1, amount))
+ assert(worldedit.cuboid_linear_expand(name, 'z', 1, amount))
+ assert(worldedit.cuboid_linear_expand(name, 'z', -1, amount))
+ elseif dir == "v" then
+ assert(worldedit.cuboid_linear_expand(name, 'y', 1, amount))
+ assert(worldedit.cuboid_linear_expand(name, 'y', -1, amount))
+ else
+ return false, "Invalid number of arguments"
+ end
+
+ worldedit.marker_update(name)
+ return true, "Region outset by " .. amount .. " blocks"
+ end,
+ }
+)
+
+
+minetest.register_chatcommand("/inset", {
+ params = "[h|v] <amount>",
+ description = "inset the selection",
+ privs = {worldedit=true},
+ func = function(name, param)
+ local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
+
+ if find == nil then
+ return false, "invalid usage: " .. param
+ end
+
+ local pos1 = worldedit.pos1[name]
+ local pos2 = worldedit.pos2[name]
+
+ if pos1 == nil or pos2 == nil then
+ return false,
+ "Undefined region. Region must be defined beforehand."
+ end
+
+ 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))
+ assert(worldedit.cuboid_linear_expand(name, 'x', -1, -amount))
+ assert(worldedit.cuboid_linear_expand(name, 'z', 1, -amount))
+ assert(worldedit.cuboid_linear_expand(name, 'z', -1, -amount))
+ elseif dir == "v" then
+ assert(worldedit.cuboid_linear_expand(name, 'y', 1, -amount))
+ assert(worldedit.cuboid_linear_expand(name, 'y', -1, -amount))
+ else
+ return false, "Invalid number of arguments"
+ end
+
+ worldedit.marker_update(name)
+ return true, "Region inset by " .. amount .. " blocks"
+ end,
+ }
+)
+
+
+minetest.register_chatcommand("/shift", {
+ params = "[x|y|z|?|up|down|left|right|front|back] [+|-]<amount>",
+ description = "Moves the selection region. Does not move contents.",
+ privs = {worldedit=true},
+ func = function(name, param)
+ local pos1 = worldedit.pos1[name]
+ local pos2 = worldedit.pos2[name]
+ local find, _, direction, amount = param:find("([%?%l]+)%s*([+-]?%d+)")
+
+ if find == nil then
+ worldedit.player_notify(name, "invalid usage: " .. param)
+ return
+ end
+
+ if pos1 == nil or pos2 == nil then
+ worldedit.player_notify(name,
+ "Undefined region. Region must be defined beforehand.")
+ return
+ end
+
+ local axis, dir
+ if direction == "x" or direction == "y" or direction == "z" then
+ axis, dir = direction, 1
+ elseif direction == "?" then
+ axis, dir = worldedit.player_axis(name)
+ else
+ axis, dir = worldedit.translate_direction(name, direction)
+ end
+
+ if axis == nil or dir == nil then
+ return false, "Invalid if looking straight up or down"
+ end
+
+ assert(worldedit.cuboid_shift(name, axis, amount * dir))
+ worldedit.marker_update(name)
+
+ return true, "Region shifted by " .. amount .. " nodes"
+ end,
+ }
+)
+
+
+minetest.register_chatcommand("/expand", {
+ params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
+ description = "expand the selection in one or two directions at once",
+ privs = {worldedit=true},
+ func = function(name, param)
+ local find, _, sign, direction, amount,
+ rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
+
+ if find == nil then
+ worldedit.player_notify(name, "invalid use: " .. param)
+ return
+ end
+
+ if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
+ worldedit.player_notify(name,
+ "Undefined region. Region must be defined beforehand.")
+ return
+ end
+
+ local absolute = direction:find("[xyz?]")
+ local dir, axis
+
+ if rev_amount == "" then
+ rev_amount = 0
+ end
+
+ if absolute == nil then
+ axis, dir = worldedit.translate_direction(name, direction)
+
+ if axis == nil or dir == nil then
+ return false, "Invalid if looking straight up or down"
+ end
+ else
+ if direction == "?" then
+ axis, dir = worldedit.player_axis(name)
+ else
+ axis = direction
+ dir = 1
+ end
+ end
+
+ if sign == "-" then
+ dir = -dir
+ end
+
+ worldedit.cuboid_linear_expand(name, axis, dir, amount)
+ worldedit.cuboid_linear_expand(name, axis, -dir, rev_amount)
+ worldedit.marker_update(name)
+ return true, "Region expanded by " .. (amount + rev_amount) .. " nodes"
+ end,
+ }
+)
+
+
+minetest.register_chatcommand("/contract", {
+ params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
+ description = "contract the selection in one or two directions at once",
+ privs = {worldedit=true},
+ func = function(name, param)
+ local find, _, sign, direction, amount,
+ rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
+
+ if find == nil then
+ worldedit.player_notify(name, "invalid use: " .. param)
+ return
+ end
+
+ if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
+ worldedit.player_notify(name,
+ "Undefined region. Region must be defined beforehand.")
+ return
+ end
+
+ local absolute = direction:find("[xyz?]")
+ local dir, axis
+
+ if rev_amount == "" then
+ rev_amount = 0
+ end
+
+ if absolute == nil then
+ axis, dir = worldedit.translate_direction(name, direction)
+
+ if axis == nil or dir == nil then
+ return false, "Invalid if looking straight up or down"
+ end
+ else
+ if direction == "?" then
+ axis, dir = worldedit.player_axis(name)
+ else
+ axis = direction
+ dir = 1
+ end
+ end
+
+ if sign == "-" then
+ dir = -dir
+ end
+
+ worldedit.cuboid_linear_expand(name, axis, dir, -amount)
+ worldedit.cuboid_linear_expand(name, axis, -dir, -rev_amount)
+ worldedit.marker_update(name)
+ return true, "Region contracted by " .. (amount + rev_amount) .. " nodes"
+ end,
+ }
+)
diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 08a9811..b9313cc 100644
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -10,6 +10,7 @@ if minetest.place_schematic then
worldedit.prob_list = {}
end
+dofile(minetest.get_modpath("worldedit_commands") .. "/cuboid.lua")
dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")
local safe_region, check_region = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")
@@ -588,7 +589,7 @@ minetest.register_chatcommand("/spiral", {
end
local node = get_node(name, nodename)
if not node then return nil end
- return check_region(name, param)
+ return 1 -- TODO: return an useful value
end),
})
@@ -856,6 +857,30 @@ minetest.register_chatcommand("/fixlight", {
end),
})
+minetest.register_chatcommand("/drain", {
+ params = "",
+ description = "Remove any fluid node within the current WorldEdit region",
+ privs = {worldedit=true},
+ func = safe_region(function(name, param)
+ -- TODO: make an API function for this
+ local count = 0
+ local pos1, pos2 = worldedit.sort_pos(worldedit.pos1[name], worldedit.pos2[name])
+ for x = pos1.x, pos2.x do
+ for y = pos1.y, pos2.y do
+ for z = pos1.z, pos2.z do
+ local n = minetest.get_node({x=x, y=y, z=z}).name
+ local d = minetest.registered_nodes[n]
+ if d ~= nil and (d["drawtype"] == "liquid" or d["drawtype"] == "flowingliquid") then
+ minetest.remove_node({x=x, y=y, z=z})
+ count = count + 1
+ end
+ end
+ end
+ end
+ worldedit.player_notify(name, count .. " nodes updated")
+ end),
+})
+
minetest.register_chatcommand("/hide", {
params = "",
description = "Hide all nodes in the current WorldEdit region non-destructively",
@@ -1145,8 +1170,8 @@ minetest.register_chatcommand("/mtschemprob", {
return
end
for k,v in pairs(problist) do
- local prob = math.floor(((v["prob"] / 256) * 100) * 100 + 0.5) / 100
- text = text .. minetest.pos_to_string(v["pos"]) .. ": " .. prob .. "% | "
+ local prob = math.floor(((v.prob / 256) * 100) * 100 + 0.5) / 100
+ text = text .. minetest.pos_to_string(v.pos) .. ": " .. prob .. "% | "
end
worldedit.player_notify(name, "currently set node probabilities:")
worldedit.player_notify(name, text)
@@ -1156,16 +1181,14 @@ minetest.register_chatcommand("/mtschemprob", {
end,
})
-minetest.register_on_player_receive_fields(
- function(player, formname, fields)
- if (formname == "prob_val_enter") and (fields.text ~= "") then
- local name = player:get_player_name()
- local prob_entry = {pos=worldedit.prob_pos[name], prob=tonumber(fields.text)}
- local index = table.getn(worldedit.prob_list[name]) + 1
- worldedit.prob_list[name][index] = prob_entry
- end
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+ if formname == "prob_val_enter" and not (fields.text == "" or fields.text == nil) then
+ local name = player:get_player_name()
+ local prob_entry = {pos=worldedit.prob_pos[name], prob=tonumber(fields.text)}
+ local index = table.getn(worldedit.prob_list[name]) + 1
+ worldedit.prob_list[name][index] = prob_entry
end
-)
+end)
minetest.register_chatcommand("/clearobjects", {
params = "",
diff --git a/worldedit_commands/mark.lua b/worldedit_commands/mark.lua
index 4062cae..7f880ea 100644
--- a/worldedit_commands/mark.lua
+++ b/worldedit_commands/mark.lua
@@ -153,7 +153,11 @@ minetest.register_entity(":worldedit:region_cube", {
end
end,
on_punch = function(self, hitter)
- for _, entity in ipairs(worldedit.marker_region[self.player_name]) do
+ local markers = worldedit.marker_region[self.player_name]
+ if not markers then
+ return
+ end
+ for _, entity in ipairs(markers) do
entity:remove()
end
worldedit.marker_region[self.player_name] = nil
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-30 23:06:57 +0000