Added weapon parser and tests