Add more weapon types

[ghost]

and use arrays of weapon types and sub types to simplify dual wielded vs 2 handed options