Change drop and liftimer settings (boats, carts, mobs), change defultsettings

games/default/files/boats/init.lua

@@ -152,11 +152,14 @@ end
 
 
 function boat.on_step(self, dtime)
-
+	local drop_timer = 300 -- 5 min
+	if not minetest.is_singleplayer() then
+		drop_timer = 60 -- 1 min
+	end
 	self.count = (self.count or 0) + dtime
 
 	-- Drop boat if the player is not on board
-	if self.count > 120 then
+	if self.count > drop_timer then
 		minetest.add_item(self.object:get_pos(), "boats:boat")
 		self.object:remove()
 		return

games/default/files/boost_cart/cart_entity.lua

@@ -189,15 +189,18 @@ local function rail_sound(self, dtime)
 	end
 end
 
-
 local v3_len = vector.length
 function cart_entity:on_step(dtime)
 
 	-- Drop cart if there is no player or items inside.
 	if not self.driver and #self.attached_items == 0 then
+		local drop_timer = 300 -- 5 min
+		if not minetest.is_singleplayer() then
+			drop_timer = 60 -- 1 min
+		end
 		self.count = (self.count or 0) + dtime
 
-		if self.count > 120 then
+		if self.count > drop_timer then
 			minetest.add_item(self.object:get_pos(), "carts:cart")
 			if self.sound_handle then
 				minetest.sound_stop(self.sound_handle)

games/default/files/mobs_redo/api.lua

@@ -75,6 +75,10 @@ local node_ice = "default:ice"
 local node_snowblock = "default:snowblock"
 local node_snow = "default:snow"
 mobs.fallback_node = minetest.registered_aliases["mapgen_dirt"] or "default:dirt"
+local lifetime = 1200 -- 20 min
+if not minetest.is_singleplayer() then
+	lifetime = 300 -- 5 min
+end
 
 local mob_class = {
 	stepheight = 1.1, -- was 0.6
@@ -82,7 +86,7 @@ local mob_class = {
 	owner = "",
 	order = "",
 	jump_height = 4,
-	lifetimer = 600, -- was 10 minutes
+	lifetimer = lifetime,
 	physical = true,
 	collisionbox = {-0.25, -0.25, -0.25, 0.25, 0.25, 0.25},
 	visual_size = {x = 1, y = 1},
@@ -2760,7 +2764,7 @@ if damage >= 1 then
 			self.object:settexturemod("")
 		end)
 	end)
-	
+
 	end -- END if damage
 
 		-- knock back effect (only on full punch)
@@ -2930,7 +2934,7 @@ function mob_class:mob_activate(staticdata, def, dtime)
 			self[_] = stat
 		end
 	end
-	
+
 	-- force current model into mob
 	self.mesh = def.mesh
 	self.base_mesh = def.mesh
@@ -3240,7 +3244,7 @@ function mob_class:on_step(dtime)
 	self:do_jump()
 
 	self:do_runaway_from(self)
-	
+
 	self:do_stay_near()
 end
 
@@ -3754,7 +3758,7 @@ end
 
 -- Register spawn eggs
 
--- Note: This also introduces the “spawn_egg” group:
+-- Note: This also introduces the "spawn_egg" group:
 -- * spawn_egg=1: Spawn egg (generic mob, no metadata)
 -- * spawn_egg=2: Spawn egg (captured/tamed mob, metadata)
 function mobs:register_egg(mob, desc, background, addegg, no_creative)
@@ -4126,7 +4130,7 @@ function mobs:feed_tame(self, clicker, feed_count, breed, tame)
 
 		-- feed and tame
 		self.food = (self.food or 0) + 1
-		
+
 		if self.food >= feed_count then
 
 			self.food = 0

src/defaultsettings.cpp

@@ -142,7 +142,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("leaves_style", "fancy");
 	settings->setDefault("connected_glass", "false");
 	settings->setDefault("smooth_lighting", "true");
-	settings->setDefault("display_gamma", "2.2");
+	settings->setDefault("display_gamma", "3.0");
 	settings->setDefault("texture_path", "");
 	settings->setDefault("shader_path", "");
 	settings->setDefault("video_driver", "opengl");
@@ -277,7 +277,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("strict_protocol_version_checking", "false");
 	settings->setDefault("player_transfer_distance", "0");
 	settings->setDefault("max_simultaneous_block_sends_per_client", "10");
-	settings->setDefault("max_simultaneous_block_sends_server_total", "1000");
+	settings->setDefault("max_simultaneous_block_sends_server_total", "10000");
 	settings->setDefault("time_send_interval", "5");
 
 	settings->setDefault("default_game", "default");
@@ -316,7 +316,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("max_objects_per_block", "16");
 	settings->setDefault("server_map_save_interval", "5.3");
 	settings->setDefault("chat_message_max_size", "500");
-	settings->setDefault("chat_message_limit_per_10sec", "8.0");
+	settings->setDefault("chat_message_limit_per_10sec", "5.0");
 	settings->setDefault("chat_message_limit_trigger_kick", "50");
 	settings->setDefault("sqlite_synchronous", "2");
 	settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
@@ -387,11 +387,9 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("video_driver", "ogles1");
 	settings->setDefault("touchtarget", "true");
 	settings->setDefault("touchscreen_threshold", "20");
-	settings->setDefault("fixed_virtual_joystick", "true");
 	settings->setDefault("doubletap_jump", "true");
-	settings->setDefault("max_simultaneous_block_sends_per_client", "5");
 	settings->setDefault("abm_interval", "2.0");
-	settings->setDefault("client_unload_unused_data_timeout", "60");
+	settings->setDefault("dedicated_server_step", "0.2");
 	settings->setDefault("curl_verify_cert", "false");
 	settings->setDefault("gui_scaling_filter_txr2img", "false");
 	settings->setDefault("mapgens_available", "v7p, v6, flat");
@@ -482,7 +480,7 @@ void set_default_settings(Settings *settings)
 	}
 
 	// set the optimal settings depending on the model
-	if (([SDVersion deviceVersion] == iPhone4S) || ([SDVersion deviceVersion] == iPhone5) || ([SDVersion deviceVersion] == iPhone5S) || ([SDVersion deviceVersion] == iPhone6) || ([SDVersion deviceVersion] == iPhone6Plus) || ([SDVersion deviceVersion] == iPodTouch5Gen) || ([SDVersion deviceVersion] == iPad2) || ([SDVersion deviceVersion] == iPad3) || ([SDVersion deviceVersion] == iPadMini) || ([SDVersion deviceVersion] == iPadMini2)) {
+	if (([SDVersion deviceVersion] == iPhone4S) || ([SDVersion deviceVersion] == iPhone5) || ([SDVersion deviceVersion] == iPhone5S) || ([SDVersion deviceVersion] == iPhone6) || ([SDVersion deviceVersion] == iPhone6Plus) || ([SDVersion deviceVersion] == iPodTouch5Gen) || ([SDVersion deviceVersion] == iPodTouch6Gen) || ([SDVersion deviceVersion] == iPad2) || ([SDVersion deviceVersion] == iPad3) || ([SDVersion deviceVersion] == iPadMini) || ([SDVersion deviceVersion] == iPadMini2)) {
 		// minimal settings
 		settings->setDefault("smooth_lighting", "false");
 		settings->setDefault("viewing_range", "25");
@@ -493,7 +491,7 @@ void set_default_settings(Settings *settings)
 		settings->setDefault("client_mapblock_limit", "250");
 		settings->setDefault("active_block_range", "1");
 		settings->setDefault("max_block_generate_distance", "2");
-	} else if (([SDVersion deviceVersion] == iPhone6S) || ([SDVersion deviceVersion] == iPhone6SPlus) || ([SDVersion deviceVersion] == iPhoneSE) || ([SDVersion deviceVersion] == iPhone7) || ([SDVersion deviceVersion] == iPhone7Plus) || ([SDVersion deviceVersion] == iPodTouch6Gen) || ([SDVersion deviceVersion] == iPad4) || ([SDVersion deviceVersion] == iPadMini3) || ([SDVersion deviceVersion] == iPadMini4) || ([SDVersion deviceVersion] == iPadAir))  {
+	} else if (([SDVersion deviceVersion] == iPhone6S) || ([SDVersion deviceVersion] == iPhone6SPlus) || ([SDVersion deviceVersion] == iPhoneSE) || ([SDVersion deviceVersion] == iPhone7) || ([SDVersion deviceVersion] == iPhone7Plus) || ([SDVersion deviceVersion] == iPad4) || ([SDVersion deviceVersion] == iPadMini3) || ([SDVersion deviceVersion] == iPadMini4) || ([SDVersion deviceVersion] == iPadAir))  {
 		// medium settings
 		settings->setDefault("viewing_range", "50");
 		settings->setDefault("chunksize", "3");