Fix some setting documentation

* Horizontal and vertical are used wrongly. Use height and width because horizontal/vertical describes different things. Thanks @kilbith for pointing out. * Update minetest.conf.example and settings_translation_file.cpp * Correct maximum/minimum copy paste mistake.
minetest · Dec 10, 2015 · 8e3602f · 8e3602f
1 parent a64d78a
commit 8e3602f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 33 deletions.
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
@@ -401,13 +401,13 @@ pause_fps_max (FPS in pause menu) int 20
 viewing_range_nodes_max (Viewing range maximum) int 160
 
 #    The allowed adjustment range for the automatic rendering range adjustment.
-#    Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm.
+#    Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm.
 viewing_range_nodes_min (Viewing range minimum) int 35
 
-#    Vertical initial window size.
+#    Width component of the initial window size.
 screenW (Screen width) int 800
 
-#    Horizontal initial window size.
+#    Height component of the initial window size.
 screenH (Screen height) int 600
 
 #    Fullscreen mode.

diff --git a/minetest.conf.example b/minetest.conf.example
@@ -451,15 +451,15 @@
 # viewing_range_nodes_max = 160
 
 #    The allowed adjustment range for the automatic rendering range adjustment.
-#    Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm.
+#    Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm.
 #    type: int
 # viewing_range_nodes_min = 35
 
-#    Vertical initial window size.
+#    Width component of the initial window size.
 #    type: int
 # screenW = 800
 
-#    Horizontal initial window size.
+#    Height component of the initial window size.
 #    type: int
 # screenH = 600
 
@@ -1243,7 +1243,7 @@
 #    6 = "Mandy Cousin" julia set.
 #    7 = "Variation" mandelbrot set.
 #    8 = "Variation" julia set.
-#    type: int
+#    type: int min: 1 max: 8
 # mgfractal_formula = 1
 
 #    Iterations of the recursive function.

diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
@@ -185,11 +185,11 @@ fake_function() {
 	gettext("Viewing range maximum");
 	gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range minimum to disable the auto-adjustment algorithm.");
 	gettext("Viewing range minimum");
-	gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range minimum to disable the auto-adjustment algorithm.");
+	gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range maximum to disable the auto-adjustment algorithm.");
 	gettext("Screen width");
-	gettext("Vertical initial window size.");
+	gettext("Width component of the initial window size.");
 	gettext("Screen height");
-	gettext("Horizontal initial window size.");
+	gettext("Height component of the initial window size.");
 	gettext("Full screen");
 	gettext("Fullscreen mode.");
 	gettext("Full screen BPP");
@@ -424,7 +424,7 @@ fake_function() {
 	gettext("Map generation limit");
 	gettext("Where the map generator stops.\nPlease note:\n-    Limited to 31000 (setting above has no effect)\n-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n-    Those groups have an offset of -32, -32 nodes from the origin.\n-    Only groups which are within the map_generation_limit are generated");
 	gettext("Mapgen flags");
-	gettext("Global map generation attributes.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.\n'trees' and 'flat' flags only have effect in mgv6.");
+	gettext("Global map generation attributes.\nIn Mapgen v6 the 'decorations' flag controls all decorations except trees\nand junglegrass, in all other mapgens this flag controls all decorations.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.");
 	gettext("Advanced");
 	gettext("Chunk size");
 	gettext("Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes).");
@@ -480,33 +480,45 @@ fake_function() {
 	gettext("Mapgen v7 ridge noise parameters");
 	gettext("Mapgen v7 cave1 noise parameters");
 	gettext("Mapgen v7 cave2 noise parameters");
+	gettext("Mapgen flat");
+	gettext("Mapgen flat flags");
+	gettext("Map generation attributes specific to Mapgen flat.\nOccasional lakes and hills added to the flat world.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.");
+	gettext("Mapgen flat ground level");
+	gettext("Y of flat ground.");
+	gettext("Mapgen flat large cave depth");
+	gettext("Y of upper limit of large pseudorandom caves.");
+	gettext("Mapgen flat lake threshold");
+	gettext("Terrain noise threshold for lakes.\nControls proportion of world area covered by lakes.\nAdjust towards 0.0 for a larger proportion.");
+	gettext("Mapgen flat lake steepness");
+	gettext("Controls steepness/depth of lake depressions.");
+	gettext("Mapgen flat hill threshold");
+	gettext("Terrain noise threshold for hills.\nControls proportion of world area covered by hills.\nAdjust towards 0.0 for a larger proportion.");
+	gettext("Mapgen flat hill steepness");
+	gettext("Controls steepness/height of hills.");
+	gettext("Mapgen flat terrain noise parameters");
+	gettext("Determines terrain shape.\nThe 3 numbers in brackets control the scale of the\nterrain, the 3 numbers should be identical.");
+	gettext("Mapgen flat filler depth noise parameters");
+	gettext("Mapgen flat cave1 noise parameters");
+	gettext("Mapgen flat cave2 noise parameters");
 	gettext("Mapgen fractal");
-	gettext("Mapgen fractal flags");
-	gettext("Map generation attributes specific to Mapgen fractal.\n'julia' selects a julia set to be generated instead of a mandelbrot set.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.");
-	gettext("Mapgen fractal mandelbrot iterations");
-	gettext("Mandelbrot set: Iterations of the recursive function.\nControls scale of finest detail.");
-	gettext("Mapgen fractal mandelbrot scale");
-	gettext("Mandelbrot set: Approximate (X,Y,Z) scales in nodes.");
-	gettext("Mapgen fractal mandelbrot offset");
-	gettext("Mandelbrot set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by m_scale for offsets in nodes.");
-	gettext("Mapgen fractal mandelbrot slice w");
-	gettext("Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2.");
-	gettext("Mapgen fractal julia iterations");
-	gettext("Julia set: Iterations of the recursive function.\nControls scale of finest detail.");
-	gettext("Mapgen fractal julia scale");
-	gettext("Julia set: Approximate (X,Y,Z) scales in nodes.");
-	gettext("Mapgen fractal julia offset");
-	gettext("Julia set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by j_scale for offsets in nodes.");
-	gettext("Mapgen fractal julia slice w");
-	gettext("Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Mapgen fractal formula");
+	gettext("Choice of 8 4-dimensional fractals.\n1 = \"Roundy\" mandelbrot set.\n2 = \"Roundy\" julia set.\n3 = \"Squarry\" mandelbrot set.\n4 = \"Squarry\" julia set.\n5 = \"Mandy Cousin\" mandelbrot set.\n6 = \"Mandy Cousin\" julia set.\n7 = \"Variation\" mandelbrot set.\n8 = \"Variation\" julia set.");
+	gettext("Mapgen fractal iterations");
+	gettext("Iterations of the recursive function.\nControls scale of finest detail.");
+	gettext("Mapgen fractal scale");
+	gettext("Approximate (X,Y,Z) scale of fractal in nodes.");
+	gettext("Mapgen fractal offset");
+	gettext("(X,Y,Z) offset of fractal from world centre.\nUsed to move a suitable spawn area of low land close to (0, 0).\nThe default is suitable for mandelbrot sets, it needs to be edited for julia sets,\ndo this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0).\nRange roughly -2 to 2. Multiply by 'scale' for offset in nodes.");
+	gettext("Mapgen fractal slice w");
+	gettext("W co-ordinate of the generated 3D slice of the 4D shape.\nAlters the generated 3D shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia x");
-	gettext("Julia set: X value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: X value determining the 4D shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia y");
-	gettext("Julia set: Y value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: Y value determining the 4D shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia z");
-	gettext("Julia set: Z value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: Z value determining the 4D shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia w");
-	gettext("Julia set: W value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: W value determining the 4D shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal seabed noise parameters");
 	gettext("Mapgen fractal filler depth noise parameters");
 	gettext("Mapgen fractal cave1 noise parameters");