Pyramids spawn only in desert biomes with desert_sand.

There is 3 types of pyramids now:
Sand (default), desert_sand and silver_sand pyramids.
This commit is contained in:
sys4-fr 2018-03-28 01:39:54 +02:00
parent 145a73188c
commit 55f4a1f292
1 changed files with 18 additions and 10 deletions

View File

@ -1,4 +1,5 @@
pyramids = {} pyramids = {}
local random = math.random
dofile(minetest.get_modpath("tsm_pyramids").."/mummy.lua") dofile(minetest.get_modpath("tsm_pyramids").."/mummy.lua")
dofile(minetest.get_modpath("tsm_pyramids").."/nodes.lua") dofile(minetest.get_modpath("tsm_pyramids").."/nodes.lua")
@ -22,20 +23,20 @@ function pyramids.fill_chest(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
inv:set_size("main", 8*4) inv:set_size("main", 8*4)
if math.random(1,10) < 7 then return end if random(1,10) < 7 then return end
local stacks = {} local stacks = {}
if minetest.get_modpath("treasurer") ~= nil then if minetest.get_modpath("treasurer") ~= nil then
stacks = treasurer.select_random_treasures(3,7,9,{"minetool", "food", "crafting_component"}) stacks = treasurer.select_random_treasures(3,7,9,{"minetool", "food", "crafting_component"})
else else
for i=0,2,1 do for i=0,2,1 do
local stuff = chest_stuff[math.random(1,#chest_stuff)] local stuff = chest_stuff[random(1,#chest_stuff)]
if stuff.name == "farming:bread" and not minetest.get_modpath("farming") then stuff = chest_stuff[1] end if stuff.name == "farming:bread" and not minetest.get_modpath("farming") then stuff = chest_stuff[1] end
table.insert(stacks, {name=stuff.name, count = math.random(1,stuff.max)}) table.insert(stacks, {name=stuff.name, count = random(1,stuff.max)})
end end
end end
for s=1,#stacks do for s=1,#stacks do
if not inv:contains_item("main", stacks[s]) then if not inv:contains_item("main", stacks[s]) then
inv:set_stack("main", math.random(1,32), stacks[s]) inv:set_stack("main", random(1,32), stacks[s])
end end
end end
@ -67,7 +68,7 @@ local function underground(pos, stone, sand)
while can_replace(p2)==true do while can_replace(p2)==true do
cnt = cnt+1 cnt = cnt+1
if cnt > 25 then break end if cnt > 25 then break end
if cnt>math.random(2,4) then mat = stone end if cnt>random(2,4) then mat = stone end
minetest.set_node(p2, {name=mat}) minetest.set_node(p2, {name=mat})
p2.y = p2.y-1 p2.y = p2.y-1
end end
@ -142,9 +143,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
local noise1 = perlin1:get2d({x=minp.x,y=minp.y})--,z=minp.z}) local noise1 = perlin1:get2d({x=minp.x,y=minp.y})--,z=minp.z})
if noise1 > 0.25 or noise1 < -0.26 then if noise1 > 0.25 or noise1 < -0.26 then
local mpos = {x=math.random(minp.x,maxp.x), y=math.random(minp.y,maxp.y), z=math.random(minp.z,maxp.z)} local mpos = {x=random(minp.x,maxp.x), y=random(minp.y,maxp.y), z=random(minp.z,maxp.z)}
local sands = {"default:desert_sand", "default:sand"} local sands = {"default:desert_sand"}
local p2 local p2
local sand local sand
for s=1, #sands do for s=1, #sands do
@ -152,7 +153,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
p2 = minetest.find_node_near(mpos, 25, sand) p2 = minetest.find_node_near(mpos, 25, sand)
while p2 == nil and cnt < 5 do while p2 == nil and cnt < 5 do
cnt = cnt+1 cnt = cnt+1
mpos = {x=math.random(minp.x,maxp.x), y=math.random(minp.y,maxp.y), z=math.random(minp.z,maxp.z)} mpos = {x=random(minp.x,maxp.x), y=random(minp.y,maxp.y), z=random(minp.z,maxp.z)}
p2 = minetest.find_node_near(mpos, 25, sand) p2 = minetest.find_node_near(mpos, 25, sand)
end end
if p2 ~= nil then if p2 ~= nil then
@ -187,14 +188,21 @@ minetest.register_on_generated(function(minp, maxp, seed)
return return
end end
if math.random(0,10) > 7 then if random(0,10) > 7 then
return return
end end
local p_type = random(1, 3)
local p_pot = {
[1] = {"default:sandstonebrick", "default:sandstone", "default:sandstone", "default:sand"},
[2] = {"default:desert_sandstone_brick", "default:desert_sandstone", "default:desert_stone", "default:desert_sand"},
[3] = {"default:silver_sandstone_brick", "default:silver_sandstone", "default:silver_sandstone", "default:silver_sand"}
}
if sand == "default:desert_sand" then if sand == "default:desert_sand" then
if minetest.get_modpath("sandplus") then if minetest.get_modpath("sandplus") then
minetest.after(0.8, make, p2, "sandplus:desert_sandstonebrick", "sandplus:desert_sandstone", "default:desert_stone", "default:desert_sand") minetest.after(0.8, make, p2, "sandplus:desert_sandstonebrick", "sandplus:desert_sandstone", "default:desert_stone", "default:desert_sand")
else else
minetest.after(0.8, make, p2, "default:sandstonebrick", "default:sandstone", "default:desert_stone", "default:desert_sand") minetest.after(0.8, make, p2, p_pot[p_type][1], p_pot[p_type][2], p_pot[p_type][3], p_pot[p_type][4])
end end
else else
minetest.after(0.8, make, p2, "default:sandstonebrick", "default:sandstone", "default:sandstone", "default:sand") minetest.after(0.8, make, p2, "default:sandstonebrick", "default:sandstone", "default:sandstone", "default:sand")