Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index bde6505a0fdd73b4e1d9a1ddf5407b4a21a6f513..23e06ab0514f5ea7b1a5d033804408789772b4d7 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -52,8 +52,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("screenshot_format", "png");
        settings->setDefault("screenshot_quality", "0");
        settings->setDefault("client_unload_unused_data_timeout", "600");
-       settings->setDefault("client_mapblock_limit", "5000");
-       settings->setDefault("enable_build_where_you_stand", "false");
+       settings->setDefault("client_mapblock_limit", "7500");
+       settings->setDefault("enable_build_where_you_stand", "true");
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
        settings->setDefault("curl_file_download_timeout", "300000");
@@ -63,24 +63,36 @@ void set_default_settings(Settings *settings)
        settings->setDefault("max_out_chat_queue_size", "20");
        settings->setDefault("pause_on_lost_focus", "false");
        settings->setDefault("enable_register_confirmation", "true");
-       
+
+       // Cheat Menu
+       settings->setDefault("cheat_menu_font", "FM_Standard");
+       settings->setDefault("cheat_menu_bg_color", "(45, 45, 68)");
+       settings->setDefault("cheat_menu_bg_color_alpha", "173");
+       settings->setDefault("cheat_menu_active_bg_color", "(0, 0, 0)");
+       settings->setDefault("cheat_menu_active_bg_color_alpha", "210");
+       settings->setDefault("cheat_menu_font_color", "(255, 255, 255)");
+       settings->setDefault("cheat_menu_font_color_alpha", "195");
+       settings->setDefault("cheat_menu_selected_font_color", "(255, 255, 255)");
+       settings->setDefault("cheat_menu_selected_font_color_alpha", "235");
+       settings->setDefault("cheat_menu_head_height", "50");
+       settings->setDefault("cheat_menu_entry_height", "40");
+       settings->setDefault("cheat_menu_entry_width", "200");
+
        // Cheats
        settings->setDefault("xray", "false");
        settings->setDefault("xray_nodes", "default:stone,mcl_core:stone");
        settings->setDefault("fullbright", "false");
        settings->setDefault("priv_bypass", "true");
-       settings->setDefault("fastdig", "false");
        settings->setDefault("freecam", "false");
        settings->setDefault("prevent_natural_damage", "true");
        settings->setDefault("freecam", "false");
-       settings->setDefault("killaura", "false");
        settings->setDefault("no_hurt_cam", "false");
-       settings->setDefault("increase_tool_range", "true");
-       settings->setDefault("increase_tool_range_plus", "false");
+       settings->setDefault("reach", "true");
        settings->setDefault("hud_flags_bypass", "true");
        settings->setDefault("antiknockback", "false");
        settings->setDefault("entity_speed", "false");
        settings->setDefault("autodig", "false");
+       settings->setDefault("fastdig", "false");
        settings->setDefault("jesus", "false");
        settings->setDefault("fastplace", "false");
        settings->setDefault("autoplace", "false");
@@ -88,32 +100,27 @@ void set_default_settings(Settings *settings)
        settings->setDefault("no_night", "false");
        settings->setDefault("coords", "false");
        settings->setDefault("point_liquids", "false");
-       settings->setDefault("log_particles", "false");
        settings->setDefault("spamclick", "false");
        settings->setDefault("no_force_rotate", "false");
-       settings->setDefault("enable_tracers", "false");
-       settings->setDefault("enable_esp", "false");
        settings->setDefault("no_slow", "false");
        settings->setDefault("float_above_parent", "false");
-       settings->setDefault("ignore_status_messages", "true");
-       settings->setDefault("mark_deathmessages", "true");
-       settings->setDefault("autosneak", "false");
-       settings->setDefault("autoeject", "false");
-       settings->setDefault("eject_items", "");
-       settings->setDefault("autotool", "false");
-       settings->setDefault("autorespawn", "false");
-       settings->setDefault("next_item", "false");
-       settings->setDefault("scaffold", "false");
-       settings->setDefault("scaffold_plus", "false");
-       settings->setDefault("block_water", "false");
-       settings->setDefault("autotnt", "false");
-       settings->setDefault("replace", "false");
-       settings->setDefault("crystal_pvp", "false");
-       settings->setDefault("autototem", "false");
        settings->setDefault("dont_point_nodes", "false");
-       settings->setDefault("strip", "false");
-       settings->setDefault("autorefill", "false");
-       settings->setDefault("nuke", "false");
+       settings->setDefault("cheat_hud", "true");
+       settings->setDefault("node_esp_nodes", "");
+       settings->setDefault("jetpack", "false");
+       settings->setDefault("autohit", "false");
+       settings->setDefault("antislip", "false");
+       settings->setDefault("enable_entity_esp", "false");
+       settings->setDefault("enable_entity_tracers", "false");
+       settings->setDefault("enable_player_esp", "false");
+       settings->setDefault("enable_player_tracers", "false");
+       settings->setDefault("enable_node_esp", "false");
+       settings->setDefault("enable_node_tracers", "false");
+       settings->setDefault("entity_esp_color", "(255, 255, 255)");
+       settings->setDefault("player_esp_color", "(0, 255, 0)");
+       settings->setDefault("tool_range", "2");
+       settings->setDefault("scaffold", "false");
+       settings->setDefault("killaura", "false");
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -124,6 +131,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_right", "KEY_KEY_D");
        settings->setDefault("keymap_jump", "KEY_SPACE");
        settings->setDefault("keymap_sneak", "KEY_LSHIFT");
+       settings->setDefault("keymap_dig", "KEY_LBUTTON");
+       settings->setDefault("keymap_place", "KEY_RBUTTON");
        settings->setDefault("keymap_drop", "KEY_KEY_Q");
        settings->setDefault("keymap_zoom", "KEY_KEY_Z");
        settings->setDefault("keymap_inventory", "KEY_KEY_I");
@@ -163,7 +172,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_toggle_killaura", "KEY_KEY_X");
        settings->setDefault("keymap_toggle_freecam", "KEY_KEY_G");
        settings->setDefault("keymap_toggle_scaffold", "KEY_KEY_Y");
-       settings->setDefault("keymap_toggle_next_item", "KEY_KEY_U");
        settings->setDefault("keymap_select_up", "KEY_UP");
        settings->setDefault("keymap_select_down", "KEY_DOWN");
        settings->setDefault("keymap_select_left", "KEY_LEFT");
@@ -225,8 +233,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("tooltip_show_delay", "400");
        settings->setDefault("tooltip_append_itemname", "false");
        settings->setDefault("fps_max", "60");
-       settings->setDefault("pause_fps_max", "20");
-       settings->setDefault("viewing_range", "100");
+       settings->setDefault("fps_max_unfocused", "20");
+       settings->setDefault("viewing_range", "190");
 #if ENABLE_GLES
        settings->setDefault("near_plane", "0.1");
 #endif
@@ -290,7 +298,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("show_entity_selectionbox", "false");
        settings->setDefault("texture_clean_transparent", "false");
        settings->setDefault("texture_min_size", "64");
-       settings->setDefault("ambient_occlusion_gamma", "2.2");
+       settings->setDefault("ambient_occlusion_gamma", "1.8");
 #if ENABLE_GLES
        settings->setDefault("enable_shaders", "false");
 #else
@@ -300,7 +308,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("arm_inertia", "true");
 
        settings->setDefault("enable_minimap", "true");
-       settings->setDefault("minimap_shape_round", "true");
+       settings->setDefault("minimap_shape_round", "false");
        settings->setDefault("minimap_double_scan_height", "true");
 
        // Effects
@@ -311,15 +319,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("bilinear_filter", "false");
        settings->setDefault("trilinear_filter", "false");
        settings->setDefault("tone_mapping", "false");
-       settings->setDefault("enable_bumpmapping", "false");
-       settings->setDefault("enable_parallax_occlusion", "false");
-       settings->setDefault("generate_normalmaps", "false");
-       settings->setDefault("normalmaps_strength", "0.6");
-       settings->setDefault("normalmaps_smooth", "1");
-       settings->setDefault("parallax_occlusion_mode", "1");
-       settings->setDefault("parallax_occlusion_iterations", "4");
-       settings->setDefault("parallax_occlusion_scale", "0.08");
-       settings->setDefault("parallax_occlusion_bias", "0.04");
        settings->setDefault("enable_waving_water", "false");
        settings->setDefault("water_wave_height", "1.0");
        settings->setDefault("water_wave_length", "20.0");
@@ -331,7 +330,7 @@ void set_default_settings(Settings *settings)
        // Input
        settings->setDefault("invert_mouse", "false");
        settings->setDefault("mouse_sensitivity", "0.2");
-       settings->setDefault("repeat_rightclick_time", "0.25");
+       settings->setDefault("repeat_place_time", "0.25");
        settings->setDefault("safe_dig_and_place", "false");
        settings->setDefault("random_input", "false");
        settings->setDefault("aux1_descends", "false");
@@ -348,9 +347,9 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_type", "");
        settings->setDefault("repeat_joystick_button_time", "0.17");
        settings->setDefault("joystick_frustum_sensitivity", "170");
+       settings->setDefault("joystick_deadzone", "2048");
 
        // Main menu
-       settings->setDefault("main_menu_style", "full");
        settings->setDefault("main_menu_path", "");
        settings->setDefault("serverlist_file", "favoriteservers.txt");
 
@@ -389,11 +388,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chat_font_size", "0"); // Default "font_size"
 
        // ContentDB
-       settings->setDefault("contentdb_url", "https://content.minetest.net");
+       settings->setDefault("contentdb_url", "http://cheatdb.elidragon.com");
+       settings->setDefault("contentdb_max_concurrent_downloads", "3");
+
 #ifdef __ANDROID__
-       settings->setDefault("contentdb_flag_blacklist", "nonfree, android_default");
+       settings->setDefault("contentdb_flag_blacklist", "android_default");
 #else
-       settings->setDefault("contentdb_flag_blacklist", "nonfree, desktop_default");
+       settings->setDefault("contentdb_flag_blacklist", "desktop_default");
 #endif
 
 
@@ -426,11 +427,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("disallow_empty_password", "false");
        settings->setDefault("disable_anticheat", "false");
        settings->setDefault("enable_rollback_recording", "false");
-#ifdef NDEBUG
-       settings->setDefault("deprecated_lua_api_handling", "legacy");
-#else
        settings->setDefault("deprecated_lua_api_handling", "log");
-#endif
 
        settings->setDefault("kick_msg_shutdown", "Server shutting down.");
        settings->setDefault("kick_msg_crash", "This server has experienced an internal error. You will now be disconnected.");
@@ -438,11 +435,11 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("chat_message_format", "<@name> @message");
        settings->setDefault("profiler_print_interval", "0");
-       settings->setDefault("active_object_send_range_blocks", "4");
-       settings->setDefault("active_block_range", "3");
+       settings->setDefault("active_object_send_range_blocks", "8");
+       settings->setDefault("active_block_range", "4");
        //settings->setDefault("max_simultaneous_block_sends_per_client", "1");
        // This causes frametime jitter on client side, or does it?
-       settings->setDefault("max_block_send_distance", "10");
+       settings->setDefault("max_block_send_distance", "12");
        settings->setDefault("block_send_optimize_distance", "4");
        settings->setDefault("server_side_occlusion_culling", "true");
        settings->setDefault("csm_restriction_flags", "62");
@@ -457,19 +454,22 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chat_message_limit_per_10sec", "8.0");
        settings->setDefault("chat_message_limit_trigger_kick", "50");
        settings->setDefault("sqlite_synchronous", "2");
+       settings->setDefault("map_compression_level_disk", "3");
+       settings->setDefault("map_compression_level_net", "-1");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
        settings->setDefault("abm_interval", "1.0");
+       settings->setDefault("abm_time_budget", "0.2");
        settings->setDefault("nodetimer_interval", "0.2");
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "action");
        settings->setDefault("debug_log_size_max", "50");
        settings->setDefault("chat_log_level", "error");
-       settings->setDefault("emergequeue_limit_total", "512");
-       settings->setDefault("emergequeue_limit_diskonly", "64");
-       settings->setDefault("emergequeue_limit_generate", "64");
+       settings->setDefault("emergequeue_limit_total", "1024");
+       settings->setDefault("emergequeue_limit_diskonly", "128");
+       settings->setDefault("emergequeue_limit_generate", "128");
        settings->setDefault("num_emerge_threads", "1");
        settings->setDefault("secure.enable_security", "true");
        settings->setDefault("secure.trusted_mods", "");
@@ -500,7 +500,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("mapgen_limit", "31000");
        settings->setDefault("chunksize", "5");
        settings->setDefault("fixed_map_seed", "");
-       settings->setDefault("max_block_generate_distance", "8");
+       settings->setDefault("max_block_generate_distance", "10");
        settings->setDefault("enable_mapgen_debug_info", "false");
        Mapgen::setDefaultSettings(settings);
 
@@ -538,9 +538,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("max_block_generate_distance", "5");
        settings->setDefault("enable_3d_clouds", "false");
        settings->setDefault("fps_max", "30");
-       settings->setDefault("pause_fps_max", "10");
+       settings->setDefault("fps_max_unfocused", "10");
        settings->setDefault("max_objects_per_block", "20");
        settings->setDefault("sqlite_synchronous", "1");
+       settings->setDefault("map_compression_level_disk", "-1");
+       settings->setDefault("map_compression_level_net", "3");
        settings->setDefault("server_map_save_interval", "15");
        settings->setDefault("client_mapblock_limit", "1000");
        settings->setDefault("active_block_range", "2");