Updated pickWeapon