Added some different weapon types and probably some other weapon logic