added shield and weapon class