Change tooltips and remove old code

builtin/common/settings/dlg_change_mapgen_flags.lua

@@ -46,45 +46,50 @@ local function get_formspec(dialogdata)
 	end
 
 	local fields = {}
-	local function add_field(x, name, label, value, tt)
+	local function add_field(x, name, label, value, tooltips)
 		fields[#fields + 1] = ("field[%f,%f;3.3,1;%s;%s;%s]"):format(
 			x, height, name, label, core.formspec_escape(value or "")
 		)
-		if tt then
+		if tooltips then
-			fields[#fields + 1] = ("tooltip[%s;%s]"):format(name, tt)
+			fields[#fields + 1] = ("tooltip[%s;%s]"):format(name, table.concat(tooltips, "\n"))
 		end
 	end
 	-- First row
 	height = height + 0.3
-	add_field(0.3, "te_offset", fgettext("Offset"), t[1], fgettext("This value offsets the final noise."))
+	add_field(0.3, "te_offset", fgettext("Offset"), t[1], {fgettext("This value offsets the final noise.")})
-	add_field(3.6, "te_scale",  fgettext("Scale"),  t[2], fgettext("This value multiplies the noise before the offset is added."))
+	add_field(3.6, "te_scale",  fgettext("Scale"),  t[2], {fgettext("This value multiplied with the noise before the offset is added.")})
-	add_field(6.9, "te_seed",   fgettext("Seed"),   t[6], fgettext("This value acts as a random seed for the noise. Every value will result in a different, random result."))
+	add_field(6.9, "te_seed",   fgettext("Seed"),   t[6], {
+			fgettext("This value acts as a random seed for the noise. The same seed results in the same noise.")})
 	height = height + 1.1
 
 	-- Second row
-	add_field(0.3, "te_spreadx", fgettext("X spread"), t[3], fgettext("This value \"scales\" the noise in the X axis by this value."))
+	add_field(0.3, "te_spreadx", fgettext("X spread"), t[3], {
+			fgettext("This value scales the noise in the X axis by this value."),
+			fgettext("This is also the scale of the largest structures in the X direction of the noise.")})
 	if dimension == 3 then
-		add_field(3.6, "te_spready", fgettext("Y spread"), t[4], fgettext("This value \"scales\" the noise in the Y axis by this value."))
+		add_field(3.6, "te_spready", fgettext("Y spread"), t[4], {
+			fgettext("This value scales the noise in the Y axis by this value."),
+			fgettext("This is also the scale of the largest structures in the Y direction of the noise.")})
 	else
 		fields[#fields + 1] = "label[4," .. height - 0.2 .. ";" ..
 				fgettext("2D Noise") .. "]"
 	end
-	add_field(6.9, "te_spreadz", fgettext("Z spread"), t[5], fgettext("This value \"scales\" the noise in the Z axis by this value."))
+	add_field(6.9, "te_spreadz", fgettext("Z spread"), t[5], {
+			fgettext("This value scales the noise in the Z axis by this value."),
+			fgettext("This is also the scale of the largest structures in the Z direction of the noise.")})
 	height = height + 1.1
 
 	-- Third row
-	add_field(0.3, "te_octaves", fgettext("Octaves"),     t[7], fgettext(
+	add_field(0.3, "te_octaves", fgettext("Octaves"),     t[7], {
-[[This value controls how many octaves the noise will have.
+			fgettext("This value controls how many octaves the noise will have."),
-An octave is a simple noise generator. Its scale and amplitude will be multiplied based on the Persistence and Lacunarity settings.
+			fgettext("An octave is a simple noise generator. Its scale and amplitude will be multiplied based on the Persistence and Lacunarity settings."),
-Finally, all of the octaves will be added to generate this noise.]]))
+			fgettext("Finally, all of the octaves will be added to generate this noise.")})
-	add_field(3.6, "te_persist", fgettext("Persistence"), t[8], fgettext(
+	add_field(3.6, "te_persist", fgettext("Persistence"), t[8], {
-[[This value multiplies an octave's amplitude by the previous octave multiplied by this value.
+			fgettext("This value multiplies every octave's amplitude by persistence^i where i is the place of the octave."),
-
+			fgettext("Example: If the persistence was 0.5, the 1st octave would be amplified by 1, the 2nd would be by 0.5, the 3rd would be by 0.25, etc.")})
-Example: If the persistence was 0.5, the 1st octave would be scaled by 1, the 2nd would be by 0.5, the 3rd would be by 0.25, etc.]]))
+	add_field(6.9, "te_lacun",   fgettext("Lacunarity"),  t[9], {
-	add_field(6.9, "te_lacun",   fgettext("Lacunarity"),  t[9], fgettext(
+			fgettext("This value multiplies every octave's scale by lacunarity^i where i is the place of the octave."),
-[[This value multiplies an octave's scale by the previous octave multiplied by this value.
+			fgettext("Example: If the lacunarity was 3, the 1st octave would be scaled by 1, the 2nd would be by 3, the 3rd would be by 9s, etc.")})
-
-Example: If the lacunarity was 0.5, the 1st octave would be scaled by 1, the 2nd would be by 0.5, the 3rd would be by 0.25, etc.]]))
 	height = height + 1.1
 
 
@@ -107,11 +112,9 @@ Example: If the lacunarity was 0.5, the 1st octave would be scaled by 1, the 2nd
 			for noise settings in the settings menu. ]]
 			.. fgettext("defaults") .. ";" -- defaults
 			.. tostring(flags["defaults"] == true) .. "]" -- to get false if nil
-			.. "tooltip[cb_defaults;" .. fgettext(
+			.. "tooltip[cb_defaults;" .. fgettext("This flag overrides the eased flag based on the noise map type.")
-[[This flag overrides the eased flag based on the noise map type.
+			.. "\n" .. fgettext("2D noise will make eased on.")
-
+			.. "\n" .. fgettext("3D noise will make eased off.") .. "]"
-2D noise will make eased on.
-3D noise will make eased off.]]) .. "]"
 			.. "checkbox[5," .. height - 0.6 .. ";cb_eased;"
 			--[[~ "eased" is a noise parameter flag.
 			It is used to make the map smoother and
@@ -119,11 +122,10 @@ Example: If the lacunarity was 0.5, the 1st octave would be scaled by 1, the 2nd
 			the settings menu. ]]
 			.. fgettext("eased") .. ";" -- eased
 			.. tostring(flags["eased"] == true) .. "]"
-			.. "tooltip[cb_eased;" .. fgettext(
+			.. "tooltip[cb_eased;"
-[[This flag maps noise gradient values onto a quintic S-curve before performing interpolation. 
+			 .. fgettext("This flag maps noise gradient values onto a quintic S-curve before performing interpolation.")
-This results in smooth noise instead of gridlike noise.
+			.. "\n" .. fgettext("This results in smooth noise instead of gridlike noise.")
-
+			.. "\n" .. fgettext("Making 3D noise eased is not recommended because it significantly increases the load.") .. "]"
-Making 3D noise eased is not recommended because it significantly increases the computation load.]]) .. "]"
 			.. "checkbox[5," .. height - 0.15 .. ";cb_absvalue;"
 			--[[~ "absvalue" is a noise parameter flag.
 			It is short for "absolute value".
@@ -131,9 +133,9 @@ Making 3D noise eased is not recommended because it significantly increases the
 			the settings menu. ]]
 			.. fgettext("absvalue") .. ";" -- absvalue
 			.. tostring(flags["absvalue"] == true) .. "]"
-			.. "tooltip[cb_absvalue;" .. fgettext(
+			.. "tooltip[cb_absvalue;"
-[[This flag takes the absolute value of each octave while adding them together.
+			.. fgettext("This flag takes the absolute value of each octave while adding them together.")
-This results in "spiky" noise.]]) .. "]"
+			.. "\n" .. fgettext("This results in spiky noise.") .. "]"
 
 	height = height + 1