FlamingRCCars
/
MineClone5-FlamingRCCars
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[mcl_mapgen_core, mcl_biomes] Make chorus growth deterministic

This commit is contained in:
kay27 2021-05-10 02:24:38 +04:00
parent a3d3055e8a
commit f3c540af5d
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mods/ITEMS/mcl_end/chorus_plant.lua
View File

@ -309,7 +309,7 @@ minetest.register_node("mcl_end:chorus_plant", {
}) })
-- Grow a complete chorus plant at pos -- Grow a complete chorus plant at pos
mcl_end.grow_chorus_plant = function(pos, node) mcl_end.grow_chorus_plant = function(pos, node, pr)
local flowers = { pos } local flowers = { pos }
-- Plant initial flower (if it isn't there already) -- Plant initial flower (if it isn't there already)
if not node then if not node then
@ -321,7 +321,7 @@ mcl_end.grow_chorus_plant = function(pos, node)
while true do while true do
local new_flowers_list = {} local new_flowers_list = {}
for f=1, #flowers do for f=1, #flowers do
local new_flowers = mcl_end.grow_chorus_plant_step(flowers[f], minetest.get_node(flowers[f])) local new_flowers = mcl_end.grow_chorus_plant_step(flowers[f], minetest.get_node(flowers[f]), pr)
if #new_flowers > 0 then if #new_flowers > 0 then
table.insert(new_flowers_list, new_flowers) table.insert(new_flowers_list, new_flowers)
end end
@ -340,7 +340,7 @@ end
-- Grow a single step of a chorus plant at pos. -- Grow a single step of a chorus plant at pos.
-- Pos must be a chorus flower. -- Pos must be a chorus flower.
mcl_end.grow_chorus_plant_step = function(pos, node) mcl_end.grow_chorus_plant_step = function(pos, node, pr)
local new_flower_buds = {} local new_flower_buds = {}
local above = { x = pos.x, y = pos.y + 1, z = pos.z } local above = { x = pos.x, y = pos.y + 1, z = pos.z }
local node_above = minetest.get_node(above) local node_above = minetest.get_node(above)
@ -396,7 +396,7 @@ mcl_end.grow_chorus_plant_step = function(pos, node)
if grow_chance then if grow_chance then
local new_flowers = {} local new_flowers = {}
local r = math.random(1, 100) local r = pr:next(1, 100)
local age = node.param2 local age = node.param2
if r <= grow_chance then if r <= grow_chance then
table.insert(new_flowers, above) table.insert(new_flowers, above)
@ -404,13 +404,13 @@ mcl_end.grow_chorus_plant_step = function(pos, node)
age = age + 1 age = age + 1
local branches local branches
if branching == false then if branching == false then
branches = math.random(1, 4) branches = pr:next(1, 4)
elseif branching == true then elseif branching == true then
branches = math.random(0, 3) branches = pr:next(0, 3)
end end
local branch_grown = false local branch_grown = false
for b=1, branches do for b=1, branches do
local next_branch = math.random(1, #around) local next_branch = pr:next(1, #around)
local branch = vector.add(pos, around[next_branch]) local branch = vector.add(pos, around[next_branch])
local below_branch = vector.add(branch, {x=0,y=-1,z=0}) local below_branch = vector.add(branch, {x=0,y=-1,z=0})
if minetest.get_node(below_branch).name == "air" then if minetest.get_node(below_branch).name == "air" then
@ -457,7 +457,7 @@ minetest.register_abm({
interval = 35.0, interval = 35.0,
chance = 4.0, chance = 4.0,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
mcl_end.grow_chorus_plant_step(pos, node) mcl_end.grow_chorus_plant_step(pos, node, pr)
end, end,
}) })

7
mods/MAPGEN/mcl_biomes/init.lua
View File

@ -3976,9 +3976,12 @@ if mg_name ~= "singlenode" then
--local poslist = {} --local poslist = {}
for _, pos in ipairs(gennotify["decoration#"..deco_id_chorus_plant] or {}) do for _, pos in ipairs(gennotify["decoration#"..deco_id_chorus_plant] or {}) do
local realpos = { x = pos.x, y = pos.y + 1, z = pos.z } local realpos = { x = pos.x, y = pos.y + 1, z = pos.z }
mcl_end.grow_chorus_plant(realpos) local node = minetest.get_node(realpos)
if node and node.name == "mcl_end:chorus_flower" then
mcl_end.grow_chorus_plant(realpos, node, PseudoRandom(blockseed + 14))
end end
end) end
end, 999999999)
end end
end end