Update combat calculations to use wielded weapons