worked on weapon and armor class
fixing merges