Factored out Armor, refactored Weapon Initilisation style.
Factored out boromir entirely, minor error corrections.