X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fdefaultsettings.cpp;h=619c26eec8669c374b4f1691e2520ca4afc9f15d;hb=fba7dc2168954ff73f80d8e749d11bd2f55e6fbd;hp=2ec23b9d86f21f5fde69a9f190289df81e5691b1;hpb=f22339ed891afddca53f7442c63aedd7aecc566d;p=dragonfireclient.git diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 2ec23b9d8..619c26eec 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -48,7 +48,7 @@ void set_default_settings(Settings *settings) settings->setDefault("pitch_move", "false"); settings->setDefault("fast_move", "false"); settings->setDefault("noclip", "false"); - settings->setDefault("screenshot_path", "."); + settings->setDefault("screenshot_path", "screenshots"); settings->setDefault("screenshot_format", "png"); settings->setDefault("screenshot_quality", "0"); settings->setDefault("client_unload_unused_data_timeout", "600"); @@ -63,20 +63,71 @@ 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_Mono"); + settings->setDefault("m_bg_color_alpha", "173"); + settings->setDefault("m_active_bg_color_alpha", "210"); + settings->setDefault("m_font_color_alpha", "195"); + settings->setDefault("m_selected_font_color_alpha", "235"); + + // Cheats settings->setDefault("xray", "false"); - settings->setDefault("xray_node", "default:stone"); + 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", "falses"); + 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("hud_flags_bypass", "true"); settings->setDefault("antiknockback", "false"); - + settings->setDefault("entity_speed", "false"); + settings->setDefault("autodig", "false"); + settings->setDefault("jesus", "false"); + settings->setDefault("fastplace", "false"); + settings->setDefault("autoplace", "false"); + settings->setDefault("instant_break", "false"); + 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("chat_color", "rainbow"); + settings->setDefault("use_chat_color", "false"); + settings->setDefault("chat_reverse", "false"); + settings->setDefault("forcefield", "false"); + settings->setDefault("friendlist", ""); + settings->setDefault("cheat_hud", "true"); + // Keymap settings->setDefault("remote_port", "30000"); settings->setDefault("keymap_forward", "KEY_KEY_W"); @@ -89,11 +140,12 @@ void set_default_settings(Settings *settings) settings->setDefault("keymap_drop", "KEY_KEY_Q"); settings->setDefault("keymap_zoom", "KEY_KEY_Z"); settings->setDefault("keymap_inventory", "KEY_KEY_I"); + settings->setDefault("keymap_enderchest", "KEY_KEY_O"); settings->setDefault("keymap_special1", "KEY_KEY_E"); settings->setDefault("keymap_chat", "KEY_KEY_T"); settings->setDefault("keymap_cmd", "/"); settings->setDefault("keymap_cmd_local", "."); - settings->setDefault("keymap_minimap", "KEY_F9"); + settings->setDefault("keymap_minimap", "KEY_KEY_V"); settings->setDefault("keymap_console", "KEY_F10"); settings->setDefault("keymap_rangeselect", "KEY_KEY_R"); settings->setDefault("keymap_freemove", "KEY_KEY_K"); @@ -109,6 +161,7 @@ void set_default_settings(Settings *settings) settings->setDefault("keymap_toggle_hud", "KEY_F1"); settings->setDefault("keymap_toggle_chat", "KEY_F2"); settings->setDefault("keymap_toggle_fog", "KEY_F3"); + settings->setDefault("keymap_toggle_cheat_menu", "KEY_F8"); #if DEBUG settings->setDefault("keymap_toggle_update_camera", "KEY_F4"); #else @@ -116,10 +169,19 @@ void set_default_settings(Settings *settings) #endif settings->setDefault("keymap_toggle_debug", "KEY_F5"); settings->setDefault("keymap_toggle_profiler", "KEY_F6"); - settings->setDefault("keymap_camera_mode", "KEY_F7"); + settings->setDefault("keymap_camera_mode", "KEY_KEY_C"); settings->setDefault("keymap_screenshot", "KEY_F12"); settings->setDefault("keymap_increase_viewing_range_min", "+"); settings->setDefault("keymap_decrease_viewing_range_min", "-"); + 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"); + settings->setDefault("keymap_select_right", "KEY_RIGHT"); + settings->setDefault("keymap_select_confirm", "KEY_RETURN"); settings->setDefault("keymap_slot1", "KEY_KEY_1"); settings->setDefault("keymap_slot2", "KEY_KEY_2"); settings->setDefault("keymap_slot3", "KEY_KEY_3"); @@ -220,7 +282,7 @@ void set_default_settings(Settings *settings) settings->setDefault("opaque_water", "false"); settings->setDefault("console_height", "0.6"); settings->setDefault("console_color", "(0,0,0)"); - settings->setDefault("console_alpha", "200"); + settings->setDefault("console_alpha", "150"); settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)"); settings->setDefault("formspec_fullscreen_bg_opacity", "140"); settings->setDefault("formspec_default_bg_color", "(0,0,0)"); @@ -238,7 +300,7 @@ void set_default_settings(Settings *settings) settings->setDefault("desynchronize_mapblock_texture_animation", "true"); settings->setDefault("hud_hotbar_max_width", "1.0"); settings->setDefault("enable_local_map_saving", "false"); - settings->setDefault("show_entity_selectionbox", "true"); + 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"); @@ -334,8 +396,12 @@ void set_default_settings(Settings *settings) std::string font_size_str = std::to_string(DEFAULT_FONT_SIZE); #endif + // General font settings settings->setDefault("font_size", font_size_str); settings->setDefault("mono_font_size", font_size_str); + settings->setDefault("chat_font_size", "0"); // Default "font_size" + + // ContentDB settings->setDefault("contentdb_url", "https://content.minetest.net"); #ifdef __ANDROID__ settings->setDefault("contentdb_flag_blacklist", "nonfree, android_default"); @@ -347,6 +413,9 @@ void set_default_settings(Settings *settings) // Server settings->setDefault("disable_escape_sequences", "false"); settings->setDefault("strip_color_codes", "false"); +#if USE_PROMETHEUS + settings->setDefault("prometheus_listener_address", "127.0.0.1:30000"); +#endif // Network settings->setDefault("enable_ipv6", "true"); @@ -358,7 +427,7 @@ void set_default_settings(Settings *settings) settings->setDefault("max_simultaneous_block_sends_per_client", "40"); settings->setDefault("time_send_interval", "5"); - settings->setDefault("default_game", "minetest"); + settings->setDefault("default_game", "mineclone2"); settings->setDefault("motd", ""); settings->setDefault("max_users", "15"); settings->setDefault("creative_mode", "false"); @@ -410,6 +479,7 @@ void set_default_settings(Settings *settings) 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"); @@ -456,6 +526,7 @@ void set_default_settings(Settings *settings) settings->setDefault("high_precision_fpu", "true"); settings->setDefault("enable_console", "false"); + settings->setDefault("screen_dpi", "72"); // Altered settings for macOS #if defined(__MACH__) && defined(__APPLE__) @@ -469,7 +540,7 @@ void set_default_settings(Settings *settings) settings->setDefault("screen_h", "0"); settings->setDefault("fullscreen", "true"); settings->setDefault("touchtarget", "true"); - settings->setDefault("TMPFolder", porting::getDataPath("tmp" DIR_DELIM)); + settings->setDefault("TMPFolder", porting::path_cache); settings->setDefault("touchscreen_threshold","20"); settings->setDefault("fixed_virtual_joystick", "false"); settings->setDefault("virtual_joystick_triggers_aux", "false"); @@ -491,8 +562,8 @@ void set_default_settings(Settings *settings) settings->setDefault("curl_verify_cert","false"); // Apply settings according to screen size - float x_inches = ((double) porting::getDisplaySize().X / - (160 * porting::getDisplayDensity())); + float x_inches = (float) porting::getDisplaySize().X / + (160.f * porting::getDisplayDensity()); if (x_inches < 3.7f) { settings->setDefault("hud_scaling", "0.6"); @@ -508,8 +579,5 @@ void set_default_settings(Settings *settings) settings->setDefault("mono_font_size", "14"); } // Tablets >= 6.0 use non-Android defaults for these settings -#else - settings->setDefault("screen_dpi", "72"); #endif } -