Documentation for //stack2, code style fixes, add author section to README.

Chat Commands.md

@@ -98,13 +98,13 @@ Display the volume of the current WorldEdit region.
 
     //volume
 
-### `//set <node>`
+### `//set <node1> ...`
 
-Set the current WorldEdit region to `<node>`.
+Set the current WorldEdit region to a random mix of `<node1>`, `...`.
 
     //set air
-    //set cactus
+    //set cactus stone glass
-    //set Bronze Block
+    //set Bronze
     //set mesecons:wire_00000000_off
 
 ### `//replace <search node> <replace node>`
@@ -219,6 +219,13 @@ Stack the current WorldEdit region along the x/y/z/? axis `<count>` times.
     //stack z +5
     //stack ? 12
 
+### `//stack2 <count> <x> <y> <z>`
+
+Stack the current WorldEdit region `<count>` times by offset `<x>`, `<y>`, `<z>`.
+
+    //stack2 5 3 8 2
+    //stack2 1 -1 -1 -1
+
 ### `//scale <factor>`
 
 Scale the current WorldEdit positions and region by a factor of positive integer `<factor>` with position 1 as the origin.

README.md

@@ -130,6 +130,21 @@ The WorldEdit Schematic format is accessed via the WorldEdit API, or WorldEdit s
 
 The second is the Minetest Schematic format (MTS). The details of this format may be found in the Minetest documentation and are out of the scope of this document. Access to this format is done via specialized MTS commands such as `//mtschemcreate` and `//mtschemplace`.
 
+Authors
+-------
+WorldEdit would not be possible without the contributions of many developers and designers. Below, they are listed alphabetically:
+
+    cheapie
+    cornernote
+    cyisfor
+    electricface
+    kaeza
+    khonkhortisan
+    sfan5
+    ShadowNinja
+    spillz
+    Uberi/Temperest
+
 License
 -------
 Copyright 2013 sfan5, Anthony Zhang (Uberi/Temperest), and Brett O'Donnell (cornernote).

worldedit/manipulations.lua

@@ -48,8 +48,16 @@ worldedit.set = function(pos1, pos2, nodenames)
     for i,v in ipairs(nodenames) do
         node_ids[i] = minetest.get_content_id(nodenames[i])
     end
+	if #node_ids == 1 then --only one type of node
+		local id = node_ids[1]
 		for i in area:iterp(pos1, pos2) do
-		nodes[i] = node_ids[math.random(#node_ids)]
+			nodes[i] = node_ids[id]
+		end
+	else --fill randomly with all types of specified nodes
+		local id_count, rand = #node_ids, math.random
+		for i in area:iterp(pos1, pos2) do
+			nodes[i] = node_ids[rand(id_count)]
+		end
 	end
 
 	--update map nodes
@@ -194,10 +202,10 @@ worldedit.copy2 = function(pos1, pos2, direction, volume)
 	local manip = minetest.get_voxel_manip()
 	manip:read_from_map(pos1, pos2)
 
-    local sx,sy,sz -- direction sign
+	local sx, sy, sz -- direction sign
-    local ix,iy,iz -- initial destination
+	local ix, iy, iz -- initial destination
-    local ex,ey,ez -- final destination
+	local ex, ey, ez -- final destination
-    local originalx,originaly,originalz -- source 
+	local originalx, originaly, originalz -- source
 	-- vim -> :'<,'>s/\<\([ioes]\?\)x\>/\1y/g
 	if direction.x > 0 then
 		originalx = pos2.x
@@ -254,14 +262,14 @@ worldedit.copy2 = function(pos1, pos2, direction, volume)
 	local ox,oy,oz
 
 	ox = originalx
-    for x = ix,ex,sx do
+	for x = ix, ex, sx do
 		oy = originaly
-        for y = iy,ey,sy do
+		for y = iy, ey, sy do
 			oz = originalz
-            for z = iz,ez,sz do
+			for z = iz, ez, sz do
 				-- reusing pos1/pos2 as source/dest here
-                pos1.x = ox; pos1.y = oy; pos1.z = oz
+				pos1.x, pos1.y, pos1.z = ox, oy, oz
-                pos2.x = x; pos2.y = y; pos2.z = z
+				pos2.x, pos2.y, pos2.z = x, y, z
 				local node = get_node(pos1)
 				local meta = to_table(get_meta(pos1)) --get meta of current node
 				add_node(pos2,node)
@@ -283,8 +291,8 @@ worldedit.stack2 = function(pos1, pos2, direction, amount, finished)
 			translated.x = translated.x + direction.x
 			translated.y = translated.y + direction.y
 			translated.z = translated.z + direction.z
-            worldedit.copy2(pos1,pos2,translated,volume)
+			worldedit.copy2(pos1, pos2, translated, volume)
-            minetest.after(0,nextone)
+			minetest.after(0, nextone)
 		else
 			if finished then
 				finished()

worldedit_commands/init.lua

@@ -279,19 +279,18 @@ minetest.register_chatcommand("/volume", {
 })
 
 minetest.register_chatcommand("/set", {
-	params = "<node>",
+	params = "<node1> ...",
-	description = "Set the current WorldEdit region to <node>",
+	description = "Set the current WorldEdit region to a random mix of <node1>, ...",
 	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..'"')
+                worldedit.player_notify(name, "Could not identify node \"" .. name .. "\"")
                 return
             end
-            nodes[#nodes+1] = node
+            nodes[#nodes + 1] = node
         end
 
 		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
@@ -620,8 +619,8 @@ minetest.register_chatcommand("/stack", {
 })
 
 minetest.register_chatcommand("/stack2", {
-	params = "<count> <x>/<y>/<z>",
+	params = "<count> <x> <y> <z>",
-	description = "Stack the current WorldEdit region <count> times translating each time by x, y and z in the respective directions.",
+	description = "Stack the current WorldEdit region <count> times by offset <x>, <y>, <z>",
 	privs = {worldedit=true},
 	func = function(name, param)
 		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
@@ -629,36 +628,26 @@ minetest.register_chatcommand("/stack2", {
 			worldedit.player_notify(name, "Select a position first!")
             return
         end
-        local repetitions, incs = param:match("([0-9]+)%s*(.+)")
+        local repetitions, incs = param:match("(%d+)%s*(.+)")
-        repetitions = repetitions and tonumber(repetitions)
         if repetitions == nil then
 			worldedit.player_notify(name, "invalid count: " .. param)
             return
         end
+		repetitions = tonumber(repetitions)
 
-        local x,y,z = incs:match("(.+)/(.+)/(.+)")
+        local x, y, z = incs:match("([+-]?%d+) ([+-]%d+) ([+-]%d+)")
         if x == nil then
             worldedit.player_notify(name, "invalid increments: " .. param)
             return
         end
-        x = tonumber(x)
+        x, y, z = tonumber(x), tonumber(y), tonumber(z)
-        y = tonumber(y)
-        z = tonumber(z)
-        if x == nil or y == nil or z == nil then
-            worldedit.player_notify(name, "increments must be numbers: " .. param)
-            return
-        end
 
-        local count = worldedit.volume(pos1,pos2) * repetitions
+        local count = worldedit.volume(pos1, pos2) * repetitions
 
         return safe_region(function()
-   		  worldedit.stack2(pos1, pos2, {x=x,y=y,z=z}, repetitions,
+			worldedit.stack2(pos1, pos2, {x=x, y=y, z=z}, repetitions,
-          function()
+				function() worldedit.player_notify(name, count .. " nodes stacked") end)
-		    worldedit.player_notify(name, count .. " nodes stacked")
+		end, function()
-        end)
-
-        end,
-        function() 
 			return count
 		end)(name,param) -- more hax
 	end