diff options
| -rw-r--r-- | worldedit/manipulations.lua | 13 | ||||
| -rw-r--r-- | worldedit_commands/init.lua | 22 |
2 files changed, 23 insertions, 12 deletions
diff --git a/worldedit/manipulations.lua b/worldedit/manipulations.lua index 1d4c6dc..40915ed 100644 --- a/worldedit/manipulations.lua +++ b/worldedit/manipulations.lua @@ -24,7 +24,11 @@ worldedit.volume = function(pos1, pos2) end
--sets a region defined by positions `pos1` and `pos2` to `nodename`, returning the number of nodes filled
-worldedit.set = function(pos1, pos2, nodename)
+worldedit.set = function(pos1, pos2, nodenames)
+ if type(nodenames) == 'string' then
+ nodenames = {nodenames}
+ end
+
local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
--set up voxel manipulator
@@ -40,9 +44,12 @@ worldedit.set = function(pos1, pos2, nodename) end
--fill selected area with node
- local node_id = minetest.get_content_id(nodename)
+ local node_ids = {}
+ for i,v in ipairs(nodenames) do
+ node_ids[i] = minetest.get_content_id(nodenames[i])
+ end
for i in area:iterp(pos1, pos2) do
- nodes[i] = node_id
+ nodes[i] = node_ids[math.random(#node_ids)]
end
--update map nodes
diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua index 2bbfeed..04f2f4c 100644 --- a/worldedit_commands/init.lua +++ b/worldedit_commands/init.lua @@ -278,22 +278,26 @@ minetest.register_chatcommand("/volume", { end,
})
-local check_set = function(name, param)
- local node = get_node(name, param)
- if not node then return nil end
- return check_region(name, param)
-end
-
minetest.register_chatcommand("/set", {
params = "<node>",
description = "Set the current WorldEdit region to <node>",
privs = {worldedit=true},
func = safe_region(function(name, param)
+ local nodes = {}
+
+ for nodename in param:gmatch("[^%s]+") do
+ local node = get_node(name, nodename)
+ if not node then
+ worldedit.player_notify(name, 'Could not identify node "'..name..'"')
+ return
+ end
+ nodes[#nodes+1] = node
+ end
+
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
- local node = get_node(name, param)
- local count = worldedit.set(pos1, pos2, node)
+ local count = worldedit.set(pos1, pos2, nodes)
worldedit.player_notify(name, count .. " nodes set")
- end, check_set),
+ end, check_region),
})
local check_replace = function(name, param)
|