Skip to content

Commit 8e3602f

Browse files
est31est31
committedDec 10, 2015
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.
·
5.11.00.4.14
1 parent a64d78a commit 8e3602f

File tree

3 files changed

+45
-33
lines changed

3 files changed

+45
-33
lines changed
 

‎builtin/settingtypes.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,13 @@ pause_fps_max (FPS in pause menu) int 20
401401
viewing_range_nodes_max (Viewing range maximum) int 160
402402

403403
# The allowed adjustment range for the automatic rendering range adjustment.
404-
# Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm.
404+
# Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm.
405405
viewing_range_nodes_min (Viewing range minimum) int 35
406406

407-
# Vertical initial window size.
407+
# Width component of the initial window size.
408408
screenW (Screen width) int 800
409409

410-
# Horizontal initial window size.
410+
# Height component of the initial window size.
411411
screenH (Screen height) int 600
412412

413413
# Fullscreen mode.

‎minetest.conf.example

+4-4
Original file line numberDiff line numberDiff line change
@@ -451,15 +451,15 @@
451451
# viewing_range_nodes_max = 160
452452

453453
# The allowed adjustment range for the automatic rendering range adjustment.
454-
# Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm.
454+
# Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm.
455455
# type: int
456456
# viewing_range_nodes_min = 35
457457

458-
# Vertical initial window size.
458+
# Width component of the initial window size.
459459
# type: int
460460
# screenW = 800
461461

462-
# Horizontal initial window size.
462+
# Height component of the initial window size.
463463
# type: int
464464
# screenH = 600
465465

@@ -1243,7 +1243,7 @@
12431243
# 6 = "Mandy Cousin" julia set.
12441244
# 7 = "Variation" mandelbrot set.
12451245
# 8 = "Variation" julia set.
1246-
# type: int
1246+
# type: int min: 1 max: 8
12471247
# mgfractal_formula = 1
12481248

12491249
# Iterations of the recursive function.

‎src/settings_translation_file.cpp

+38-26
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ fake_function() {
185185
gettext("Viewing range maximum");
186186
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.");
187187
gettext("Viewing range minimum");
188-
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.");
188+
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.");
189189
gettext("Screen width");
190-
gettext("Vertical initial window size.");
190+
gettext("Width component of the initial window size.");
191191
gettext("Screen height");
192-
gettext("Horizontal initial window size.");
192+
gettext("Height component of the initial window size.");
193193
gettext("Full screen");
194194
gettext("Fullscreen mode.");
195195
gettext("Full screen BPP");
@@ -424,7 +424,7 @@ fake_function() {
424424
gettext("Map generation limit");
425425
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");
426426
gettext("Mapgen flags");
427-
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.");
427+
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.");
428428
gettext("Advanced");
429429
gettext("Chunk size");
430430
gettext("Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes).");
@@ -480,33 +480,45 @@ fake_function() {
480480
gettext("Mapgen v7 ridge noise parameters");
481481
gettext("Mapgen v7 cave1 noise parameters");
482482
gettext("Mapgen v7 cave2 noise parameters");
483+
gettext("Mapgen flat");
484+
gettext("Mapgen flat flags");
485+
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.");
486+
gettext("Mapgen flat ground level");
487+
gettext("Y of flat ground.");
488+
gettext("Mapgen flat large cave depth");
489+
gettext("Y of upper limit of large pseudorandom caves.");
490+
gettext("Mapgen flat lake threshold");
491+
gettext("Terrain noise threshold for lakes.\nControls proportion of world area covered by lakes.\nAdjust towards 0.0 for a larger proportion.");
492+
gettext("Mapgen flat lake steepness");
493+
gettext("Controls steepness/depth of lake depressions.");
494+
gettext("Mapgen flat hill threshold");
495+
gettext("Terrain noise threshold for hills.\nControls proportion of world area covered by hills.\nAdjust towards 0.0 for a larger proportion.");
496+
gettext("Mapgen flat hill steepness");
497+
gettext("Controls steepness/height of hills.");
498+
gettext("Mapgen flat terrain noise parameters");
499+
gettext("Determines terrain shape.\nThe 3 numbers in brackets control the scale of the\nterrain, the 3 numbers should be identical.");
500+
gettext("Mapgen flat filler depth noise parameters");
501+
gettext("Mapgen flat cave1 noise parameters");
502+
gettext("Mapgen flat cave2 noise parameters");
483503
gettext("Mapgen fractal");
484-
gettext("Mapgen fractal flags");
485-
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.");
486-
gettext("Mapgen fractal mandelbrot iterations");
487-
gettext("Mandelbrot set: Iterations of the recursive function.\nControls scale of finest detail.");
488-
gettext("Mapgen fractal mandelbrot scale");
489-
gettext("Mandelbrot set: Approximate (X,Y,Z) scales in nodes.");
490-
gettext("Mapgen fractal mandelbrot offset");
491-
gettext("Mandelbrot set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by m_scale for offsets in nodes.");
492-
gettext("Mapgen fractal mandelbrot slice w");
493-
gettext("Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2.");
494-
gettext("Mapgen fractal julia iterations");
495-
gettext("Julia set: Iterations of the recursive function.\nControls scale of finest detail.");
496-
gettext("Mapgen fractal julia scale");
497-
gettext("Julia set: Approximate (X,Y,Z) scales in nodes.");
498-
gettext("Mapgen fractal julia offset");
499-
gettext("Julia set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by j_scale for offsets in nodes.");
500-
gettext("Mapgen fractal julia slice w");
501-
gettext("Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2.");
504+
gettext("Mapgen fractal formula");
505+
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.");
506+
gettext("Mapgen fractal iterations");
507+
gettext("Iterations of the recursive function.\nControls scale of finest detail.");
508+
gettext("Mapgen fractal scale");
509+
gettext("Approximate (X,Y,Z) scale of fractal in nodes.");
510+
gettext("Mapgen fractal offset");
511+
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.");
512+
gettext("Mapgen fractal slice w");
513+
gettext("W co-ordinate of the generated 3D slice of the 4D shape.\nAlters the generated 3D shape.\nRange roughly -2 to 2.");
502514
gettext("Mapgen fractal julia x");
503-
gettext("Julia set: X value determining the 4D shape.\nRange roughly -2 to 2.");
515+
gettext("Julia set only: X value determining the 4D shape.\nRange roughly -2 to 2.");
504516
gettext("Mapgen fractal julia y");
505-
gettext("Julia set: Y value determining the 4D shape.\nRange roughly -2 to 2.");
517+
gettext("Julia set only: Y value determining the 4D shape.\nRange roughly -2 to 2.");
506518
gettext("Mapgen fractal julia z");
507-
gettext("Julia set: Z value determining the 4D shape.\nRange roughly -2 to 2.");
519+
gettext("Julia set only: Z value determining the 4D shape.\nRange roughly -2 to 2.");
508520
gettext("Mapgen fractal julia w");
509-
gettext("Julia set: W value determining the 4D shape.\nRange roughly -2 to 2.");
521+
gettext("Julia set only: W value determining the 4D shape.\nRange roughly -2 to 2.");
510522
gettext("Mapgen fractal seabed noise parameters");
511523
gettext("Mapgen fractal filler depth noise parameters");
512524
gettext("Mapgen fractal cave1 noise parameters");

0 commit comments

Comments
 (0)
Please sign in to comment.