Adjusted spacing and converted weapon type string to enum for performance and readability
derp didn't test it. Missed an instance of the enum