mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-19 01:21:05 +01:00
Merge pull request 'Fix sugarcane not getting param2 on mapgen' (#2118) from fix_sugarcane_color into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2118
This commit is contained in:
commit
8bf1d2b235
1 changed files with 17 additions and 2 deletions
|
@ -64,6 +64,7 @@ local c_stone = minetest.get_content_id("mcl_core:stone")
|
||||||
local c_dirt = minetest.get_content_id("mcl_core:dirt")
|
local c_dirt = minetest.get_content_id("mcl_core:dirt")
|
||||||
local c_dirt_with_grass = minetest.get_content_id("mcl_core:dirt_with_grass")
|
local c_dirt_with_grass = minetest.get_content_id("mcl_core:dirt_with_grass")
|
||||||
local c_dirt_with_grass_snow = minetest.get_content_id("mcl_core:dirt_with_grass_snow")
|
local c_dirt_with_grass_snow = minetest.get_content_id("mcl_core:dirt_with_grass_snow")
|
||||||
|
local c_reeds = minetest.get_content_id("mcl_core:reeds")
|
||||||
local c_sand = minetest.get_content_id("mcl_core:sand")
|
local c_sand = minetest.get_content_id("mcl_core:sand")
|
||||||
--local c_sandstone = minetest.get_content_id("mcl_core:sandstone")
|
--local c_sandstone = minetest.get_content_id("mcl_core:sandstone")
|
||||||
local c_void = minetest.get_content_id("mcl_core:void")
|
local c_void = minetest.get_content_id("mcl_core:void")
|
||||||
|
@ -2096,6 +2097,21 @@ local function basic(vm, data, data2, emin, emax, area, minp, maxp, blockseed)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Set param2 (=color) of sugar cane
|
||||||
|
nodes = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:reeds"})
|
||||||
|
for n=1, #nodes do
|
||||||
|
local n = nodes[n]
|
||||||
|
local p_pos = area:index(n.x, n.y, n.z)
|
||||||
|
local b_pos = aream:index(n.x, 0, n.z)
|
||||||
|
local bn = minetest.get_biome_name(biomemap[b_pos])
|
||||||
|
if bn then
|
||||||
|
local biome = minetest.registered_biomes[bn]
|
||||||
|
if biome and biome._mcl_biome_type then
|
||||||
|
data2[p_pos] = biome._mcl_palette_index
|
||||||
|
lvm_used = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Nether block fixes:
|
-- Nether block fixes:
|
||||||
|
@ -2192,4 +2208,3 @@ local function basic_node(minp, maxp, blockseed)
|
||||||
end
|
end
|
||||||
|
|
||||||
mcl_mapgen_core.register_generator("main", basic, basic_node, 1, true)
|
mcl_mapgen_core.register_generator("main", basic, basic_node, 1, true)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue