Added and tested weapon-type parsing