Use weapon type instead of string