Increase defaults for viewing_range, active_object_range and related settings #10597

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 0b650c7227947a220b80a18c564613ed9025a96f..8eb667bdd97aa0473bdd30d821e0748fbefba7e1 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -594,7 +594,7 @@ fps_max_unfocused (FPS when unfocused or paused) int 20 1
 pause_on_lost_focus (Pause on lost window focus) bool false
 
 #    View distance in nodes.
-viewing_range (Viewing range) int 100 20 4000
+viewing_range (Viewing range) int 190 20 4000
 
 #   Camera 'near clipping plane' distance in nodes, between 0 and 0.25
 #   Only works on GLES platforms. Most users will not need to change this.
@@ -978,7 +978,7 @@ client_unload_unused_data_timeout (Mapblock unload timeout) int 600
 
 #    Maximum number of mapblocks for client to be kept in memory.
 #    Set to -1 for unlimited amount.
-client_mapblock_limit (Mapblock limit) int 5000
+client_mapblock_limit (Mapblock limit) int 7500
 
 #    Whether to show the client debug info (has the same effect as hitting F5).
 show_debug (Show debug info) bool false
@@ -1137,17 +1137,17 @@ ask_reconnect_on_crash (Ask to reconnect after crash) bool false
 #    Setting this larger than active_block_range will also cause the server
 #    to maintain active objects up to this distance in the direction the
 #    player is looking. (This can avoid mobs suddenly disappearing from view)
-active_object_send_range_blocks (Active object send range) int 4
+active_object_send_range_blocks (Active object send range) int 8
 
 #    The radius of the volume of blocks around every player that is subject to the
 #    active block stuff, stated in mapblocks (16 nodes).
 #    In active blocks objects are loaded and ABMs run.
 #    This is also the minimum range in which active objects (mobs) are maintained.
 #    This should be configured together with active_object_send_range_blocks.
-active_block_range (Active block range) int 3
+active_block_range (Active block range) int 4
 
 #    From how far blocks are sent to clients, stated in mapblocks (16 nodes).
-max_block_send_distance (Max block send distance) int 10
+max_block_send_distance (Max block send distance) int 12
 
 #    Maximum number of forceloaded mapblocks.
 max_forceloaded_blocks (Maximum forceloaded blocks) int 16
@@ -1433,7 +1433,7 @@ mg_name (Mapgen name) enum v7 v7,valleys,carpathian,v5,flat,fractal,singlenode,v
 water_level (Water level) int 1
 
 #    From how far blocks are generated for clients, stated in mapblocks (16 nodes).
-max_block_generate_distance (Max block generate distance) int 8
+max_block_generate_distance (Max block generate distance) int 10
 
 #    Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).
 #    Only mapchunks completely within the mapgen limit are generated.

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index fcdf6b536ec35e67dd505df82d00a8308268aaf7..dc02767335d3d44865c6d8903f7fe556f39cf1fe 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -52,7 +52,7 @@ 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("client_mapblock_limit", "7500");
        settings->setDefault("enable_build_where_you_stand", "false");
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
@@ -166,7 +166,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("tooltip_append_itemname", "false");
        settings->setDefault("fps_max", "60");
        settings->setDefault("fps_max_unfocused", "20");
-       settings->setDefault("viewing_range", "100");
+       settings->setDefault("viewing_range", "190");
 #if ENABLE_GLES
        settings->setDefault("near_plane", "0.1");
 #endif
@@ -366,11 +366,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");
@@ -429,7 +429,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);