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

merge upstream

Browse source
This commit is contained in:
Milan 2019-02-07 13:17:18 +01:00
commit 2e451bd11e
236 changed files with 7780 additions and 2577 deletions
Download patch file Download diff file Expand all files Collapse all files

67
mods/flowers/mapgen.lua
View file

@ -2,8 +2,9 @@
-- Mgv6
--
local function register_mgv6_flower(name)
local function register_mgv6_flower(flower_name)
minetest.register_decoration({
name = "flowers:"..flower_name,
deco_type = "simple",
place_on = {"default:dirt_with_grass"},
sidelen = 16,
@ -15,14 +16,15 @@ local function register_mgv6_flower(name)
octaves = 3,
persist = 0.6
},
y_min = 1,
y_max = 30,
decoration = "flowers:"..name,
y_min = 1,
decoration = "flowers:"..flower_name,
})
end
local function register_mgv6_mushroom(name)
local function register_mgv6_mushroom(mushroom_name)
minetest.register_decoration({
name = "flowers:"..mushroom_name,
deco_type = "simple",
place_on = {"default:dirt_with_grass"},
sidelen = 16,
@ -34,9 +36,9 @@ local function register_mgv6_mushroom(name)
octaves = 3,
persist = 0.6
},
y_min = 1,
y_max = 30,
decoration = "flowers:"..name,
y_min = 1,
decoration = "flowers:"..mushroom_name,
spawn_by = "default:tree",
num_spawn_by = 1,
})
@ -44,7 +46,8 @@ end
local function register_mgv6_waterlily()
minetest.register_decoration({
deco_type = "schematic",
name = "flowers:waterlily",
deco_type = "simple",
place_on = {"default:dirt"},
sidelen = 16,
noise_params = {
@ -55,10 +58,12 @@ local function register_mgv6_waterlily()
octaves = 3,
persist = 0.7
},
y_min = 0,
y_max = 0,
schematic = minetest.get_modpath("flowers").."/schematics/waterlily.mts",
rotation = "random",
y_min = 0,
decoration = "flowers:waterlily",
param2 = 0,
param2_max = 3,
place_offset_y = 1,
})
end
@ -76,13 +81,14 @@ function flowers.register_mgv6_decorations()
register_mgv6_waterlily()
end
-- TODO: figure out why we did commented these in the past
--
-- All other biome API mapgens
--
--[[
local function register_flower(seed, name)
local function register_flower(seed, flower_name)
minetest.register_decoration({
name = "flowers:"..flower_name,
deco_type = "simple",
place_on = {"default:dirt_with_grass"},
sidelen = 16,
@ -94,18 +100,18 @@ local function register_flower(seed, name)
octaves = 3,
persist = 0.6
},
biomes = {"grassland", "deciduous_forest", "coniferous_forest",
"floatland_coniferous_forest"},
y_min = 1,
biomes = {"grassland", "deciduous_forest", "floatland_grassland"},
y_max = 31000,
decoration = "flowers:"..name,
y_min = 1,
decoration = "flowers:"..flower_name,
})
end
local function register_mushroom(name)
local function register_mushroom(mushroom_name)
minetest.register_decoration({
name = "flowers:"..mushroom_name,
deco_type = "simple",
place_on = {"default:dirt_with_grass"},
place_on = {"default:dirt_with_grass", "default:dirt_with_coniferous_litter"},
sidelen = 16,
noise_params = {
offset = 0,
@ -117,15 +123,16 @@ local function register_mushroom(name)
},
biomes = {"deciduous_forest", "coniferous_forest",
"floatland_coniferous_forest"},
y_min = 1,
y_max = 31000,
decoration = "flowers:"..name,
y_min = 1,
decoration = "flowers:"..mushroom_name,
})
end
local function register_waterlily()
minetest.register_decoration({
deco_type = "schematic",
name = "default:waterlily",
deco_type = "simple",
place_on = {"default:dirt"},
sidelen = 16,
noise_params = {
@ -137,10 +144,12 @@ local function register_waterlily()
persist = 0.7
},
biomes = {"rainforest_swamp", "savanna_shore", "deciduous_forest_shore"},
y_min = 0,
y_max = 0,
schematic = minetest.get_modpath("flowers") .. "/schematics/waterlily.mts",
rotation = "random",
y_min = 0,
decoration = "flowers:waterlily",
param2 = 0,
param2_max = 3,
place_offset_y = 1,
})
end
@ -148,24 +157,26 @@ function flowers.register_decorations()
register_flower(436, "rose")
register_flower(19822, "tulip")
register_flower(1220999, "dandelion_yellow")
register_flower(800081, "chrysanthemum_green")
register_flower(36662, "geranium")
register_flower(1133, "viola")
register_flower(73133, "dandelion_white")
register_flower(42, "tulip_black")
register_mushroom("mushroom_brown")
register_mushroom("mushroom_red")
register_waterlily()
end
]]
--
--]]
-- Detect mapgen to select functions
--
local mg_name = minetest.get_mapgen_setting("mg_name")
if mg_name == "v6" then
flowers.register_mgv6_decorations()
else
--else
-- flowers.register_decorations()
end