Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mergeconflicts

Browse source
This commit is contained in:
Milan* 2016-12-15 18:03:31 +00:00
commit 960a9de9d8
188 changed files with 5137 additions and 1518 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mods/flowers/mapgen.lua
View file

@ -94,8 +94,7 @@ local function register_flower(seed, name)
octaves = 3,
persist = 0.6
},
biomes = {"stone_grassland", "sandstone_grassland",
"deciduous_forest", "coniferous_forest"},
biomes = {"grassland", "deciduous_forest", "coniferous_forest"},
y_min = 1,
y_max = 31000,
decoration = "flowers:"..name,
@ -110,7 +109,7 @@ local function register_mushroom(name)
noise_params = {
offset = 0,
scale = 0.006,
spread = {x = 200, y = 200, z = 200},
spread = {x = 250, y = 250, z = 250},
seed = 2,
octaves = 3,
persist = 0.66
@ -135,10 +134,10 @@ local function register_waterlily()
octaves = 3,
persist = 0.7
},
biomes = {"rainforest_swamp", "savanna_swamp", "deciduous_forest_swamp"},
biomes = {"rainforest_swamp", "savanna_shore", "deciduous_forest_shore"},
y_min = 0,
y_max = 0,
schematic = minetest.get_modpath("flowers").."/schematics/waterlily.mts",
schematic = minetest.get_modpath("flowers") .. "/schematics/waterlily.mts",
rotation = "random",
})
end
@ -162,12 +161,9 @@ end
-- Detect mapgen to select functions
--
-- Mods using singlenode mapgen can call these functions to enable
-- the use of minetest.generate_ores or minetest.generate_decorations
local mg_name = minetest.get_mapgen_setting("mg_name")
if mg_name == "v6" then
flowers.register_mgv6_decorations()
--elseif mg_name ~= "singlenode" then
else
-- flowers.register_decorations()
end