From 6e7ba366fc58c437640c7d603d28668b52ba79c7 Mon Sep 17 00:00:00 2001 From: Paramat Date: Mon, 18 Feb 2019 02:53:33 +0000 Subject: [PATCH] lua_api.txt, settingtypes.txt: Various improvements (#8252) --- builtin/settingtypes.txt | 12 +----------- doc/lua_api.txt | 6 +++--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index d428e5a85..209a37b2a 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1328,7 +1328,7 @@ profiler_print_interval (Engine profiling data print interval) int 0 # Name of map generator to be used when creating a new world. # Creating a world in the main menu will override this. # Current stable mapgens: -# v5, v6, v7 (except floatlands), flat, singlenode. +# v5, v6, v7 (except floatlands), singlenode. # 'stable' means the terrain shape in an existing world will not be changed # in the future. Note that biomes are defined by games and may still change. mg_name (Mapgen name) enum v7 v5,v6,v7,valleys,carpathian,fractal,flat,singlenode @@ -1347,8 +1347,6 @@ mapgen_limit (Map generation limit) int 31000 0 31000 # Global map generation attributes. # In Mapgen v6 the 'decorations' flag controls all decorations except trees # and junglegrass, in all other mapgens this flag controls all decorations. -# Flags that are not enabled are not modified from the default. -# Flags starting with 'no' are used to explicitly disable them. mg_flags (Mapgen flags) flags caves,dungeons,light,decorations,biomes caves,dungeons,light,decorations,biomes,nocaves,nodungeons,nolight,nodecorations,nobiomes # Whether dungeons occasionally project from the terrain. @@ -1429,8 +1427,6 @@ mgv5_np_ground (Ground noise) noise_params_3d 0, 40, (80, 80, 80), 983240, 4, 0. # The 'snowbiomes' flag enables the new 5 biome system. # When the new biome system is enabled jungles are automatically enabled and # the 'jungles' flag is ignored. -# Flags that are not enabled are not modified from the default. -# Flags starting with 'no' are used to explicitly disable them. mgv6_spflags (Mapgen V6 specific flags) flags jungles,biomeblend,mudflow,snowbiomes,trees jungles,biomeblend,mudflow,snowbiomes,flat,trees,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees # Deserts occur when np_biome exceeds this value. @@ -1485,8 +1481,6 @@ mgv6_np_apple_trees (Apple trees noise) noise_params_2d 0, 1, (100, 100, 100), 3 # Map generation attributes specific to Mapgen v7. # 'ridges' enables the rivers. -# Flags that are not enabled are not modified from the default. -# Flags starting with 'no' are used to explicitly disable them. mgv7_spflags (Mapgen V7 specific flags) flags mountains,ridges,nofloatlands,caverns mountains,ridges,floatlands,caverns,nomountains,noridges,nofloatlands,nocaverns # Y of mountain density gradient zero level. Used to shift mountains vertically. @@ -1582,8 +1576,6 @@ mgv7_np_cave2 (Cave2 noise) noise_params_3d 0, 12, (67, 67, 67), 10325, 3, 0.5, [*Mapgen Carpathian] # Map generation attributes specific to Mapgen Carpathian. -# Flags that are not enabled are not modified from the default. -# Flags starting with 'no' are used to explicitly disable them. mgcarpathian_spflags (Mapgen Carpathian specific flags) flags caverns caverns,nocaverns # Defines the base ground level. @@ -1664,8 +1656,6 @@ mgcarpathian_np_cavern (Cavern noise) noise_params_3d 0, 1, (384, 128, 384), 723 # Map generation attributes specific to Mapgen flat. # Occasional lakes and hills can be added to the flat world. -# Flags that are not enabled are not modified from the default. -# Flags starting with 'no' are used to explicitly disable them. mgflat_spflags (Mapgen Flat specific flags) flags nolakes,nohills lakes,hills,nolakes,nohills # Y of flat ground. diff --git a/doc/lua_api.txt b/doc/lua_api.txt index b506d43b2..2edd0d9de 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3967,7 +3967,7 @@ Environment access * Return value: Table with all node positions with a node air above * Area volume is limited to 4,096,000 nodes * `minetest.get_perlin(noiseparams)` -* `minetest.get_perlin(seeddiff, octaves, persistence, scale)` +* `minetest.get_perlin(seeddiff, octaves, persistence, spread)` * Return world-specific perlin noise (`int(worldseed)+seeddiff`) * `minetest.get_voxel_manip([pos1, pos2])` * Return voxel manipulator object. @@ -5347,9 +5347,9 @@ It can be created via `PcgRandom(seed)` or `PcgRandom(seed, sequence)`. ------------- A perlin noise generator. -It can be created via `PerlinNoise(seed, octaves, persistence, scale)` +It can be created via `PerlinNoise(seed, octaves, persistence, spread)` or `PerlinNoise(noiseparams)`. -Alternatively with `minetest.get_perlin(seeddiff, octaves, persistence, scale)` +Alternatively with `minetest.get_perlin(seeddiff, octaves, persistence, spread)` or `minetest.get_perlin(noiseparams)`. ### Methods