Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changes to support the latest schematic probability specification.
  • Loading branch information
Uberi committed Aug 16, 2013
1 parent 9ab52df commit 272541c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
8 changes: 5 additions & 3 deletions worldedit/manipulations.lua
Expand Up @@ -148,7 +148,9 @@ worldedit.copy = function(pos1, pos2, axis, amount)
local newindex2 = newindex1 + (index2 + offset[other1]) * stride[other1]
for index3 = 1, extent[other2] do
local i = newindex2 + (index3 + offset[other2]) * stride[other2]
nodes[i] = get_node(pos)
local node = get_node(pos)
node.param1 = 255 --node will always appear
nodes[i] = node
end
end

Expand Down Expand Up @@ -295,7 +297,7 @@ worldedit.scale = function(pos1, pos2, factor)

--prepare schematic of large node
local get_node, get_meta, place_schematic = minetest.get_node, minetest.get_meta, minetest.place_schematic
local placeholder_node = {name="", param1=0, param2=0}
local placeholder_node = {name="", param1=255, param2=0}
local nodes = {}
for i = 1, factor ^ 3 do
nodes[i] = placeholder_node
Expand Down Expand Up @@ -324,7 +326,7 @@ worldedit.scale = function(pos1, pos2, factor)

--create large node
placeholder_node.name = node.name
placeholder_node.param1, placeholder_node.param2 = node.param1, node.param2
placeholder_node.param2 = node.param2
bigpos.x, bigpos.y, bigpos.z = posx, posy, posz
place_schematic(bigpos, schematic)

Expand Down
2 changes: 1 addition & 1 deletion worldedit/primitives.lua
Expand Up @@ -224,7 +224,7 @@ worldedit.hollow_cylinder = function(pos, axis, length, radius, nodename) --wip:
manip:read_from_map(pos1, pos2)

--create schematic for single node column along the axis
local node = {name=nodename, param1=0, param2=0}
local node = {name=nodename, param1=255, param2=0}
local nodes = {}
for i = 1, length do
nodes[i] = node
Expand Down
3 changes: 2 additions & 1 deletion worldedit_infinity/init.lua
@@ -1,12 +1,13 @@
worldedit = worldedit or {}
local minetest = minetest --local copy of global

local get_pointed = function(pos, nearest, distance)
if distance > 100 then
return false
end

--check for collision with node
local nodename = env:get_node(pos).name
local nodename = minetest.get_node(pos).name
if nodename ~= "air"
and nodename ~= "default:water_source"
and nodename ~= "default:water_flowing" then
Expand Down

0 comments on commit 272541c

Please sign in to comment.