Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-12-23 08:29:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move Nether portal frame size into vars

Browse source
This commit is contained in:
Wuzzy 2017-08-17 15:20:10 +02:00
parent 130f05b9cd
commit 3318c2f5f3
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mods/ITEMS/mcl_portals/portal_nether.lua
View file

@ -3,6 +3,12 @@
local TCAVE = 0.6 local TCAVE = 0.6
local nobj_cave = nil local nobj_cave = nil
-- Portal frame sizes
local FRAME_SIZE_X_MIN = 4
local FRAME_SIZE_Y_MIN = 5
local FRAME_SIZE_X_MAX = 23
local FRAME_SIZE_Y_MAX = 23
-- 3D noise -- 3D noise
local np_cave = { local np_cave = {
offset = 0, offset = 0,
@ -119,19 +125,19 @@ local function build_portal(pos, target)
local p1 = {x = pos.x - 1, y = pos.y - 1, z = pos.z} local p1 = {x = pos.x - 1, y = pos.y - 1, z = pos.z}
local p2 = {x = p1.x + 3, y = p1.y + 4, z = p1.z} local p2 = {x = p1.x + 3, y = p1.y + 4, z = p1.z}
for i = 1, 4 do for i = 1, FRAME_SIZE_Y_MIN - 1 do
minetest.set_node(p, {name = "mcl_core:obsidian"}) minetest.set_node(p, {name = "mcl_core:obsidian"})
p.y = p.y + 1 p.y = p.y + 1
end end
for i = 1, 3 do for i = 1, FRAME_SIZE_X_MIN - 1 do
minetest.set_node(p, {name = "mcl_core:obsidian"}) minetest.set_node(p, {name = "mcl_core:obsidian"})
p.x = p.x + 1 p.x = p.x + 1
end end
for i = 1, 4 do for i = 1, FRAME_SIZE_Y_MIN - 1 do
minetest.set_node(p, {name = "mcl_core:obsidian"}) minetest.set_node(p, {name = "mcl_core:obsidian"})
p.y = p.y - 1 p.y = p.y - 1
end end
for i = 1, 3 do for i = 1, FRAME_SIZE_X_MIN - 1 do
minetest.set_node(p, {name = "mcl_core:obsidian"}) minetest.set_node(p, {name = "mcl_core:obsidian"})
p.x = p.x - 1 p.x = p.x - 1
end end
@ -246,16 +252,17 @@ local function check_portal(p1, p2)
end end
local function is_portal(pos) local function is_portal(pos)
for d = -3, 3 do local xsize, ysize = FRAME_SIZE_X_MIN-1, FRAME_SIZE_Y_MIN-1
for y = -4, 4 do for d = -xsize, xsize do
for y = -ysize, ysize do
local px = {x = pos.x + d, y = pos.y + y, z = pos.z} local px = {x = pos.x + d, y = pos.y + y, z = pos.z}
local pz = {x = pos.x, y = pos.y + y, z = pos.z + d} local pz = {x = pos.x, y = pos.y + y, z = pos.z + d}
if check_portal(px, {x = px.x + 3, y = px.y + 4, z = px.z}) then if check_portal(px, {x = px.x + xsize, y = px.y + ysize, z = px.z}) then
return px, {x = px.x + 3, y = px.y + 4, z = px.z} return px, {x = px.x + xsize, y = px.y + ysize, z = px.z}
end end
if check_portal(pz, {x = pz.x, y = pz.y + 4, z = pz.z + 3}) then if check_portal(pz, {x = pz.x, y = pz.y + ysize, z = pz.z + xsize}) then
return pz, {x = pz.x, y = pz.y + 4, z = pz.z + 3} return pz, {x = pz.x, y = pz.y + ysize, z = pz.z + xsize}
end end
end end
end end
@ -296,7 +303,7 @@ local function make_portal(pos)
target.y = find_nether_target_y(target.x, target.z) target.y = find_nether_target_y(target.x, target.z)
end end
local dmin, dmax, ymin, ymax = 0, 3, p1.y, p2.y local dmin, dmax, ymin, ymax = 0, FRAME_SIZE_X_MIN - 1, p1.y, p2.y
for d = dmin, dmax do for d = dmin, dmax do
for y = ymin, ymax do for y = ymin, ymax do
if not ((d == dmin or d == dmax) and (y == ymin or y == ymax)) then if not ((d == dmin or d == dmax) and (y == ymin or y == ymax)) then