mim
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Add jungle edge biome

This commit is contained in:
Wuzzy 2017-09-09 01:13:21 +02:00
parent a5a73ea12d
commit 0ceecec7c3
2 changed files with 102 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -664,6 +664,49 @@ local function register_biomes()
humidity_point = 91, humidity_point = 91,
}) })
-- Jungle edge
minetest.register_biome({
name = "jungle_edge",
node_top = "mcl_core:dirt_with_grass",
depth_top = 1,
node_filler = "mcl_core:dirt",
depth_filler = 3,
node_riverbed = "mcl_core:sand",
depth_riverbed = 2,
y_min = 1,
y_max = mcl_vars.mg_overworld_max,
heat_point = 90,
humidity_point = 87,
})
minetest.register_biome({
name = "jungle_edge_shore",
node_top = "mcl_core:dirt",
depth_top = 1,
node_filler = "mcl_core:dirt",
depth_filler = 3,
node_riverbed = "mcl_core:sand",
depth_riverbed = 2,
y_min = -1,
y_max = 0,
heat_point = 90,
humidity_point = 87,
})
minetest.register_biome({
name = "jungle_edge_ocean",
node_top = "mcl_core:dirt",
depth_top = 1,
node_filler = "mcl_core:dirt",
depth_filler = 3,
node_riverbed = "mcl_core:sand",
depth_riverbed = 2,
y_min = mcl_vars.mg_overworld_min,
y_max = -2,
heat_point = 90,
humidity_point = 87,
})
-- Swampland -- Swampland
minetest.register_biome({ minetest.register_biome({
name = "swampland", name = "swampland",
@ -1434,7 +1477,20 @@ local function register_decorations()
flags = "place_center_x, place_center_z", flags = "place_center_x, place_center_z",
rotation = "random", rotation = "random",
}) })
-- Oak in jungle minetest.register_decoration({
deco_type = "schematic",
place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"},
sidelen = 80,
fill_ratio = 0.0045,
biomes = {"jungle_edge"},
y_min = 1,
y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_tree.mts",
flags = "place_center_x, place_center_z",
rotation = "random",
})
-- Oak in jungle / jungle edge
minetest.register_decoration({ minetest.register_decoration({
deco_type = "schematic", deco_type = "schematic",
place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"}, place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"},
@ -1447,6 +1503,18 @@ local function register_decorations()
flags = "place_center_x, place_center_z", flags = "place_center_x, place_center_z",
rotation = "random", rotation = "random",
}) })
minetest.register_decoration({
deco_type = "schematic",
place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"},
sidelen = 80,
fill_ratio = 0.0004,
biomes = {"jungle_edge"},
y_min = 1,
y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_oak_classic.mts",
flags = "place_center_x, place_center_z",
rotation = "random",
})
-- Spruce -- Spruce
local function quick_spruce(seed, offset, sprucename, biomes) local function quick_spruce(seed, offset, sprucename, biomes)
@ -1671,8 +1739,7 @@ local function register_decorations()
place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" }, place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" },
sidelen = 80, sidelen = 80,
fill_ratio = ratio_mushroom_huge, fill_ratio = ratio_mushroom_huge,
-- FIXME: Should be roofed forest, but placing it there doesn't work well (leaves often go into mushroom) biomes = { "roofed_forest" },
biomes = { "forest" },
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_huge_brown.mts", schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_huge_brown.mts",
@ -1684,8 +1751,7 @@ local function register_decorations()
place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" }, place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" },
sidelen = 80, sidelen = 80,
fill_ratio = ratio_mushroom_giant, fill_ratio = ratio_mushroom_giant,
-- FIXME: Should be roofed forest, but placing it there doesn't work well (leaves often go into mushroom) biomes = { "roofed_forest" },
biomes = { "forest" },
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_giant_brown.mts", schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_giant_brown.mts",
@ -1724,8 +1790,7 @@ local function register_decorations()
place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" }, place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" },
sidelen = 80, sidelen = 80,
fill_ratio = ratio_mushroom_huge, fill_ratio = ratio_mushroom_huge,
-- FIXME: Should be roofed forest, but placing it there doesn't work well (leaves often go into mushroom) biomes = { "roofed_forest" },
biomes = { "forest" },
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_huge_red.mts", schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_huge_red.mts",
@ -1737,8 +1802,7 @@ local function register_decorations()
place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" }, place_on = { "mcl_core:dirt_with_grass", "mcl_core:dirt" },
sidelen = 80, sidelen = 80,
fill_ratio = ratio_mushroom_giant, fill_ratio = ratio_mushroom_giant,
-- FIXME: Should be roofed forest, but placing it there doesn't work well (leaves often go into mushroom) biomes = { "roofed_forest" },
biomes = { "forest" },
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_giant_red.mts", schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_giant_red.mts",
@ -1930,7 +1994,7 @@ local function register_decorations()
octaves = 2, octaves = 2,
persist = 0.66, persist = 0.66,
}, },
biomes = { "jungle", "taiga", "cold_taiga", "mega_taiga", "mega_spruce_taiga" }, biomes = { "jungle", "jungle_edge", "taiga", "cold_taiga", "mega_taiga", "mega_spruce_taiga" },
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
}) })
@ -2007,6 +2071,24 @@ local function register_decorations()
schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_bush.mts", schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_bush.mts",
flags = "place_center_x, place_center_z", flags = "place_center_x, place_center_z",
}) })
minetest.register_decoration({
deco_type = "schematic",
place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"},
sidelen = 80,
noise_params = {
offset = 0.0085,
scale = 0.025,
spread = {x = 250, y = 250, z = 250},
seed = 2930,
octaves = 4,
persist = 0.6,
},
biomes = {"jungle_edge"},
y_min = 3,
y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_bush.mts",
flags = "place_center_x, place_center_z",
})
-- Fallen logs -- Fallen logs
minetest.register_decoration({ minetest.register_decoration({
@ -2221,7 +2303,7 @@ local function register_decorations()
place_on = {"mcl_core:dirt_with_grass"}, place_on = {"mcl_core:dirt_with_grass"},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0.003, offset = 0.002,
scale = 0.006, scale = 0.006,
spread = {x = 250, y = 250, z = 250}, spread = {x = 250, y = 250, z = 250},
seed = 333, seed = 333,
@ -2231,7 +2313,7 @@ local function register_decorations()
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
decoration = "mcl_farming:melon", decoration = "mcl_farming:melon",
biomes = { "jungle" }, biomes = { "jungle", "jungle_edge" },
}) })
-- Pumpkin -- Pumpkin
@ -2262,7 +2344,7 @@ local function register_decorations()
-- Grasses and ferns -- Grasses and ferns
local grass_forest = {"plains", "taiga", "forest", "flower_forest", "birch_forest", "birch_forest_m", "roofed_forest", "swampland" } local grass_forest = {"plains", "taiga", "forest", "flower_forest", "birch_forest", "birch_forest_m", "roofed_forest", "swampland" }
local grass_plains = {"plains", "savanna", "sunflower_plains"} local grass_plains = {"plains", "savanna", "sunflower_plains", "jungle_edge"}
local grass_savanna = {"savanna"} local grass_savanna = {"savanna"}
register_grass_decoration("tallgrass", -0.03, 0.09, grass_forest) register_grass_decoration("tallgrass", -0.03, 0.09, grass_forest)
@ -2277,9 +2359,9 @@ local function register_decorations()
register_grass_decoration("tallgrass", 0.09, -0.03, grass_plains) register_grass_decoration("tallgrass", 0.09, -0.03, grass_plains)
register_grass_decoration("tallgrass", 0.18, -0.03, grass_savanna) register_grass_decoration("tallgrass", 0.18, -0.03, grass_savanna)
local fern_minimal = { "jungle", "taiga", "mega_taiga", "mega_spruce_taiga", "cold_taiga" } local fern_minimal = { "jungle", "jungle_edge", "taiga", "mega_taiga", "mega_spruce_taiga", "cold_taiga" }
local fern_low = { "jungle", "taiga", "mega_taiga", "mega_spruce_taiga" } local fern_low = { "jungle", "jungle_edge", "taiga", "mega_taiga", "mega_spruce_taiga" }
local fern_full = { "jungle" } local fern_jungle = { "jungle", "jungle_edge" }
register_grass_decoration("fern", -0.03, 0.09, fern_minimal) register_grass_decoration("fern", -0.03, 0.09, fern_minimal)
register_grass_decoration("fern", -0.015, 0.075, fern_minimal) register_grass_decoration("fern", -0.015, 0.075, fern_minimal)
register_grass_decoration("fern", 0, 0.06, fern_minimal) register_grass_decoration("fern", 0, 0.06, fern_minimal)
@ -2471,7 +2553,7 @@ local function register_decorations()
end end
end end
local flower_biomes1 = {"plains", "sunflower_plains", "roofed_forest", "forest", "birch_forest", "birch_forest_m", "taiga", "cold_taiga", "jungle", "savanna",} local flower_biomes1 = {"plains", "sunflower_plains", "roofed_forest", "forest", "birch_forest", "birch_forest_m", "taiga", "cold_taiga", "jungle", "jungle_edge", "savanna" }
register_flower("dandelion", flower_biomes1, 8) register_flower("dandelion", flower_biomes1, 8)
register_flower("poppy", flower_biomes1, 9439) register_flower("poppy", flower_biomes1, 9439)

4
mods/MAPGEN/mcl_mapgen_core/init.lua
View File

@ -1118,6 +1118,8 @@ local function generate_tree_decorations(minp, maxp, biomemap)
local swampland_shore = minetest.get_biome_id("swampland_shore") local swampland_shore = minetest.get_biome_id("swampland_shore")
local jungle = minetest.get_biome_id("jungle") local jungle = minetest.get_biome_id("jungle")
local jungle_shore = minetest.get_biome_id("jungle_shore") local jungle_shore = minetest.get_biome_id("jungle_shore")
local jungle_edge = minetest.get_biome_id("jungle_edge")
local jungle_edge_shore = minetest.get_biome_id("jungle_edge_shore")
if biomemap then if biomemap then
-- Biome map available: Check if the required biome (jungle or swampland) -- Biome map available: Check if the required biome (jungle or swampland)
@ -1131,7 +1133,7 @@ local function generate_tree_decorations(minp, maxp, biomemap)
oaktree = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:tree"}) oaktree = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:tree"})
oakleaves = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:leaves"}) oakleaves = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:leaves"})
swamp_biome_found = true swamp_biome_found = true
elseif not jungle_biome_found and (id == jungle or id == jungle_shore) then elseif not jungle_biome_found and (id == jungle or id == jungle_shore or id == jungle_edge or id == jungle_edge_shore) then
jungletree = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:jungletree"}) jungletree = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:jungletree"})
jungleleaves = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:jungleleaves"}) jungleleaves = minetest.find_nodes_in_area(minp, maxp, {"mcl_core:jungleleaves"})
jungle_biome_found = true jungle_biome_found = true