Update Fork #1

Merged
chmodsayshello merged 696 commits from MineClone5/MineClone5:master into master 2022-03-23 14:40:26 +01:00
1 changed files with 4 additions and 4 deletions
Showing only changes of commit 978f23c70e - Show all commits

View File

@ -95,9 +95,9 @@ local c_jungleleaves = minetest.get_content_id("mcl_core:jungleleaves")
local c_vine = minetest.get_content_id("mcl_core:vine") local c_vine = minetest.get_content_id("mcl_core:vine")
local c_air = minetest.CONTENT_AIR local c_air = minetest.CONTENT_AIR
local cocoa = nil local c_cocoas = nil
if minetest.get_modpath("mcl_cocoas") then if minetest.get_modpath("mcl_cocoas") then
cocoa = { c_cocoas = {
minetest.get_content_id("mcl_cocoas:cocoa_1"), minetest.get_content_id("mcl_cocoas:cocoa_1"),
minetest.get_content_id("mcl_cocoas:cocoa_2"), minetest.get_content_id("mcl_cocoas:cocoa_2"),
minetest.get_content_id("mcl_cocoas:cocoa_3") minetest.get_content_id("mcl_cocoas:cocoa_3")
@ -1614,7 +1614,7 @@ local function generate_tree_decorations(minp, maxp, seed, data, param2_data, ar
local pos, treepos, dir local pos, treepos, dir
if cocoa ~= nil then if c_cocoas ~= nil then
local cocoachance = 40 local cocoachance = 40
if dense_vegetation then if dense_vegetation then
cocoachance = 32 cocoachance = 32
@ -1647,7 +1647,7 @@ local function generate_tree_decorations(minp, maxp, seed, data, param2_data, ar
and data[p_pos] == c_air and data[p_pos] == c_air
and l and l > 12 then and l and l > 12 then
local c = pr:next(1, 3) local c = pr:next(1, 3)
data[p_pos] = cocoa[c] data[p_pos] = c_cocoas[c]
param2_data[p_pos] = minetest.dir_to_facedir(vector.subtract(treepos, pos)) param2_data[p_pos] = minetest.dir_to_facedir(vector.subtract(treepos, pos))
lvm_used = true lvm_used = true
end end