Rework complex distance, camera shot count calc for better back compat