Allow to revert back to jungle leaves bushe and fallen logs

This commit is contained in:
Wuzzy 2017-09-13 03:15:16 +02:00
parent b357e927b4
commit 92d0dbdeef
2 changed files with 185 additions and 151 deletions

View File

@ -1,5 +1,19 @@
local mg_name = minetest.get_mapgen_setting("mg_name") local mg_name = minetest.get_mapgen_setting("mg_name")
-- Some mapgen settings
local imitate = minetest.settings:get("mcl_imitation_mode")
local generate_fallen_logs = false
-- Jungle bush type. Default (PC/Java Edition) is Jungle Wood + Oak Leaves
local jungle_bush_schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_bush_oak_leaves.mts"
if imitate == "pocket_edition" then
-- Simple fallen tree trunk logs (not very good yet)
generate_fallen_logs = true
-- Jungle bush: Jungle Wood + Jungle Leaves
jungle_bush_schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_bush_jungle_leaves.mts"
end
-- --
-- Register biomes -- Register biomes
-- --
@ -2431,6 +2445,7 @@ local function register_decorations()
register_large_flower("sunflower", {"SunflowerPlains"}, 2940, 0.01) register_large_flower("sunflower", {"SunflowerPlains"}, 2940, 0.01)
-- Jungle bush -- Jungle bush
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"},
@ -2446,7 +2461,7 @@ local function register_decorations()
biomes = {"Jungle"}, biomes = {"Jungle"},
y_min = 3, y_min = 3,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_bush_oak_leaves.mts", schematic = jungle_bush_schematic,
flags = "place_center_x, place_center_z", flags = "place_center_x, place_center_z",
}) })
minetest.register_decoration({ minetest.register_decoration({
@ -2464,7 +2479,7 @@ local function register_decorations()
biomes = {"JungleM"}, biomes = {"JungleM"},
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_core").."/schematics/mcl_core_jungle_bush_oak_leaves.mts", schematic = jungle_bush_schematic,
flags = "place_center_x, place_center_z", flags = "place_center_x, place_center_z",
}) })
minetest.register_decoration({ minetest.register_decoration({
@ -2482,168 +2497,172 @@ local function register_decorations()
biomes = {"JungleEdge", "JungleEdgeM"}, biomes = {"JungleEdge", "JungleEdgeM"},
y_min = 3, y_min = 3,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_bush_oak_leaves.mts", schematic_jungle_bush_schematic,
flags = "place_center_x, place_center_z", flags = "place_center_x, place_center_z",
}) })
-- Fallen logs -- Fallen logs
minetest.register_decoration({ -- These fallen logs are not really good yet. They must be longer and also have one upright block.
deco_type = "schematic", -- Note the decortion API does not like wide schematics, they are likely to overhang.
place_on = {"mcl_core:dirt_with_grass", "mcl_core:podzol", "mcl_core:coarse_dirt"}, if generate_fallen_logs then
sidelen = 80, minetest.register_decoration({
noise_params = { deco_type = "schematic",
offset = 0.00018, place_on = {"mcl_core:dirt_with_grass", "mcl_core:podzol", "mcl_core:coarse_dirt"},
scale = 0.00011, sidelen = 80,
spread = {x = 250, y = 250, z = 250}, noise_params = {
seed = 2, offset = 0.00018,
octaves = 3, scale = 0.00011,
persist = 0.66 spread = {x = 250, y = 250, z = 250},
}, seed = 2,
biomes = {"MegaTaiga", "MegaSpruceTaiga", "Taiga"}, octaves = 3,
y_min = 1, persist = 0.66
y_max = mcl_vars.mg_overworld_max,
schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:sprucetree", param2 = 12, prob = 127},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "air", prob = 0},
{name = "mcl_mushrooms:mushroom_brown", prob = 160},
{name = "mcl_mushrooms:mushroom_red", prob = 160},
}, },
}, biomes = {"MegaTaiga", "MegaSpruceTaiga", "Taiga"},
flags = "place_center_x", y_min = 1,
rotation = "random", y_max = mcl_vars.mg_overworld_max,
}) schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:sprucetree", param2 = 12, prob = 127},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "air", prob = 0},
{name = "mcl_mushrooms:mushroom_brown", prob = 160},
{name = "mcl_mushrooms:mushroom_red", prob = 160},
},
},
flags = "place_center_x",
rotation = "random",
})
minetest.register_decoration({ minetest.register_decoration({
deco_type = "schematic", deco_type = "schematic",
place_on = {"mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", "mcl_core:podzol", "mcl_core:podzol_snow", "mcl_core:coarse_dirt"}, place_on = {"mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", "mcl_core:podzol", "mcl_core:podzol_snow", "mcl_core:coarse_dirt"},
sidelen = 80, sidelen = 80,
noise_params = { noise_params = {
offset = 0.00018, offset = 0.00018,
scale = 0.00011, scale = 0.00011,
spread = {x = 250, y = 250, z = 250}, spread = {x = 250, y = 250, z = 250},
seed = 2, seed = 2,
octaves = 3, octaves = 3,
persist = 0.66 persist = 0.66
},
biomes = {"ColdTaiga"},
y_min = 1,
y_max = mcl_vars.mg_overworld_max,
schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:sprucetree", param2 = 12, prob = 127},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
}, },
}, biomes = {"ColdTaiga"},
flags = "place_center_x", y_min = 1,
rotation = "random", y_max = mcl_vars.mg_overworld_max,
}) schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:sprucetree", param2 = 12, prob = 127},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "mcl_core:sprucetree", param2 = 12},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
},
},
flags = "place_center_x",
rotation = "random",
})
minetest.register_decoration({ minetest.register_decoration({
deco_type = "schematic", deco_type = "schematic",
place_on = {"mcl_core:dirt_with_grass"}, place_on = {"mcl_core:dirt_with_grass"},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0.0, offset = 0.0,
scale = -0.00008, scale = -0.00008,
spread = {x = 250, y = 250, z = 250}, spread = {x = 250, y = 250, z = 250},
seed = 2, seed = 2,
octaves = 3, octaves = 3,
persist = 0.66 persist = 0.66
},
biomes = {"BirchForest", "BirchForestM",},
y_min = 1,
y_max = mcl_vars.mg_overworld_max,
schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:birchtree", param2 = 12},
{name = "mcl_core:birchtree", param2 = 12},
{name = "mcl_core:birchtree", param2 = 12, prob = 127},
{name = "mcl_mushrooms:mushroom_red", prob = 100},
{name = "mcl_mushrooms:mushroom_brown", prob = 10},
{name = "air", prob = 0},
}, },
}, biomes = {"BirchForest", "BirchForestM",},
flags = "place_center_x", y_min = 1,
rotation = "random", y_max = mcl_vars.mg_overworld_max,
}) schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:birchtree", param2 = 12},
{name = "mcl_core:birchtree", param2 = 12},
{name = "mcl_core:birchtree", param2 = 12, prob = 127},
{name = "mcl_mushrooms:mushroom_red", prob = 100},
{name = "mcl_mushrooms:mushroom_brown", prob = 10},
{name = "air", prob = 0},
},
},
flags = "place_center_x",
rotation = "random",
})
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"},
sidelen = 80, sidelen = 80,
fill_ratio = 0.005, fill_ratio = 0.005,
biomes = {"Jungle", "JungleM"}, biomes = {"Jungle", "JungleM"},
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = { schematic = {
size = {x = 3, y = 3, z = 1}, size = {x = 3, y = 3, z = 1},
data = { data = {
{name = "air", prob = 0}, {name = "air", prob = 0},
{name = "air", prob = 0}, {name = "air", prob = 0},
{name = "air", prob = 0}, {name = "air", prob = 0},
{name = "mcl_core:jungletree", param2 = 12}, {name = "mcl_core:jungletree", param2 = 12},
{name = "mcl_core:jungletree", param2 = 12}, {name = "mcl_core:jungletree", param2 = 12},
{name = "mcl_core:jungletree", param2 = 12, prob = 127}, {name = "mcl_core:jungletree", param2 = 12, prob = 127},
{name = "air", prob = 0}, {name = "air", prob = 0},
{name = "mcl_mushrooms:mushroom_brown", prob = 50}, {name = "mcl_mushrooms:mushroom_brown", prob = 50},
{name = "air", prob = 0}, {name = "air", prob = 0},
},
}, },
}, flags = "place_center_x",
flags = "place_center_x", rotation = "random",
rotation = "random", })
})
minetest.register_decoration({ minetest.register_decoration({
deco_type = "schematic", deco_type = "schematic",
place_on = {"mcl_core:dirt_with_grass"}, place_on = {"mcl_core:dirt_with_grass"},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0.00018, offset = 0.00018,
scale = 0.00011, scale = 0.00011,
spread = {x = 250, y = 250, z = 250}, spread = {x = 250, y = 250, z = 250},
seed = 2, seed = 2,
octaves = 3, octaves = 3,
persist = 0.66 persist = 0.66
},
biomes = {"Forest"},
y_min = 1,
y_max = mcl_vars.mg_overworld_max,
schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:tree", param2 = 12, prob = 127},
{name = "mcl_core:tree", param2 = 12},
{name = "mcl_core:tree", param2 = 12},
{name = "air", prob = 0},
{name = "mcl_mushrooms:mushroom_brown", prob = 96},
{name = "mcl_mushrooms:mushroom_red", prob = 96},
}, },
}, biomes = {"Forest"},
flags = "place_center_x", y_min = 1,
rotation = "random", y_max = mcl_vars.mg_overworld_max,
}) schematic = {
size = {x = 3, y = 3, z = 1},
data = {
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "air", prob = 0},
{name = "mcl_core:tree", param2 = 12, prob = 127},
{name = "mcl_core:tree", param2 = 12},
{name = "mcl_core:tree", param2 = 12},
{name = "air", prob = 0},
{name = "mcl_mushrooms:mushroom_brown", prob = 96},
{name = "mcl_mushrooms:mushroom_red", prob = 96},
},
},
flags = "place_center_x",
rotation = "random",
})
end
-- Lily pad -- Lily pad

View File

@ -59,3 +59,18 @@ craftguide_progressive_mode (EXPERIMENTAL: Enable recipe book progressive mode)
# Warning: Disabling this setting is currently EXPERIMENTAL! The generated map # Warning: Disabling this setting is currently EXPERIMENTAL! The generated map
# may not be that pretty. # may not be that pretty.
mcl_superflat_classic (Classic superflat map generation) bool true mcl_superflat_classic (Classic superflat map generation) bool true
# Which edition of Minecraft to imitate. This currently only affects two map
# generation aspects.
# This setting might be removed in a later version.
# Available options:
#
# pc_edition: PC Edition (later known as “Java Edition”).
# There are no fallen tree trunks.
# Jungle bushes have oak leaves.
#
# pocket_edition: Pocket Edition
# There are simple fallen tree trunks with mushrooms.
# Jungle bushes have jungle leaves.
mcl_imitation_mode (Imitated Minecraft edition) enum pc_edition pc_edition,pocket_edition