diff options
| -rw-r--r-- | builtin/mainmenu/tab_settings.lua | 7 | ||||
| -rw-r--r-- | builtin/settingtypes.txt | 16 |
2 files changed, 9 insertions, 14 deletions
diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 6d71904cd..db8d08d5e 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -112,7 +112,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se end if setting_type == "string" or setting_type == "noise_params" - or setting_type == "key" then + or setting_type == "key" or setting_type == "v3f" then local default = remaining_line:match("^(.*)$") if not default then @@ -381,6 +381,9 @@ local function create_change_setting_formspec(dialogdata) formspec = formspec .. ",," .. "," .. fgettext("Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, <octaves>, <persistence>") .. "," .. "," .. fgettext("Optionally the lacunarity can be appended with a leading comma.") .. "," + elseif setting.type == "v3f" then + formspec = formspec .. ",," + .. "," .. fgettext_ne("Format is 3 numbers separated by commas and inside brackets.") .. "," end formspec = formspec:sub(1, -2) -- remove trailing comma @@ -424,7 +427,7 @@ local function create_change_setting_formspec(dialogdata) .. "button[8,3.75;2,1;btn_browser_path;" .. fgettext("Browse") .. "]" else - -- TODO: fancy input for float, int, flags, noise_params + -- TODO: fancy input for float, int, flags, noise_params, v3f local width = 10 local text = get_current_value(setting) if dialogdata.error_message then diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 607fbe607..3c44ea664 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -941,15 +941,11 @@ mgfractal_spflags (Mapgen fractal flags) flags nojulia julia,nojulia mgfractal_m_iterations (Mapgen fractal mandelbrot iterations) int 9 # Mandelbrot set: Approximate (X,Y,Z) scales in nodes. -# Format is 3 numbers separated by commas and inside brackets. -mgfractal_m_scale (Mapgen fractal mandelbrot scale) string (1024.0, 256.0, 1024.0) -# Type 'string' is currently used for a v3f. +mgfractal_m_scale (Mapgen fractal mandelbrot scale) v3f (1024.0, 256.0, 1024.0) # Mandelbrot set: (X,Y,Z) offsets from world centre. -# Format is 3 numbers separated by commas and inside brackets. # Range roughly -2 to 2, multiply by m_scale for offsets in nodes. -mgfractal_m_offset (Mapgen fractal mandelbrot offset) string (1.75, 0.0, 0.0) -# Type 'string' is currently used for a v3f. +mgfractal_m_offset (Mapgen fractal mandelbrot offset) v3f (1.75, 0.0, 0.0) # Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape. # Range roughly -2 to 2. @@ -960,15 +956,11 @@ mgfractal_m_slice_w (Mapgen fractal mandelbrot slice w) float 0.0 mgfractal_j_iterations (Mapgen fractal julia iterations) int 9 # Julia set: Approximate (X,Y,Z) scales in nodes. -# Format is 3 numbers separated by commas and inside brackets. -mgfractal_j_scale (Mapgen fractal julia scale) string (2048.0, 512.0, 2048.0) -# Type 'string' is currently used for a v3f. +mgfractal_j_scale (Mapgen fractal julia scale) v3f (2048.0, 512.0, 2048.0) # Julia set: (X,Y,Z) offsets from world centre. -# Format is 3 numbers separated by commas and inside brackets. # Range roughly -2 to 2, multiply by j_scale for offsets in nodes. -mgfractal_j_offset (Mapgen fractal julia offset) string (0.0, 1.0, 0.0) -# Type 'string' is currently used for a v3f. +mgfractal_j_offset (Mapgen fractal julia offset) v3f (0.0, 1.0, 0.0) # Julia set: W co-ordinate of the generated 3D slice of the 4D shape. # Range roughly -2 to 2. |