Smoothen weapon role adaptation