added weapon class and weapon selector
merged
added knife